xserver and mesa git update 28-12-2010

1 files changed, 486 insertions, 486 deletions

diff --git a/mesalib/src/mesa/tnl/t_vb_rendertmp.h b/mesalib/src/mesa/tnl/t_vb_rendertmp.h
index 75f6f55bd..92dbf219d 100644
--- a/mesalib/src/mesa/tnl/t_vb_rendertmp.h
+++ b/mesalib/src/mesa/tnl/t_vb_rendertmp.h
@@ -1,486 +1,486 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#ifndef POSTFIX
-#define POSTFIX
-#endif
-
-#ifndef INIT
-#define INIT(x)
-#endif
-
-#ifndef NEED_EDGEFLAG_SETUP
-#define NEED_EDGEFLAG_SETUP 0
-#define EDGEFLAG_GET(a) 0
-#define EDGEFLAG_SET(a,b) (void)b
-#endif
-
-#ifndef RESET_STIPPLE
-#define RESET_STIPPLE
-#endif
-
-#ifndef TEST_PRIM_END
-#define TEST_PRIM_END(prim) (flags & PRIM_END)
-#define TEST_PRIM_BEGIN(prim) (flags & PRIM_BEGIN)
-#endif
-
-#ifndef ELT
-#define ELT(x) x
-#endif
-
-#ifndef RENDER_TAB_QUALIFIER
-#define RENDER_TAB_QUALIFIER static
-#endif
-
-static void TAG(render_points)( GLcontext *ctx,
-				GLuint start,
-				GLuint count,
-				GLuint flags )
-{
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_POINTS);
-   RENDER_POINTS( start, count );
-   POSTFIX;
-}
-
-static void TAG(render_lines)( GLcontext *ctx,
-			       GLuint start,
-			       GLuint count,
-			       GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_LINES);
-   for (j=start+1; j<count; j+=2 ) {
-      RESET_STIPPLE;
-      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-         RENDER_LINE( ELT(j-1), ELT(j) );
-      else
-         RENDER_LINE( ELT(j), ELT(j-1) );
-   }
-   POSTFIX;
-}
-
-
-static void TAG(render_line_strip)( GLcontext *ctx,
-				    GLuint start,
-				    GLuint count,
-				    GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_LINE_STRIP);
-
-   if (TEST_PRIM_BEGIN(flags)) {
-      RESET_STIPPLE;
-   }
-
-   for (j=start+1; j<count; j++ ) {
-      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-         RENDER_LINE( ELT(j-1), ELT(j) );
-      else
-         RENDER_LINE( ELT(j), ELT(j-1) );
-   }
-   POSTFIX;
-}
-
-
-static void TAG(render_line_loop)( GLcontext *ctx,
-				   GLuint start,
-				   GLuint count,
-				   GLuint flags )
-{
-   GLuint i;
-   LOCAL_VARS;
-
-   (void) flags;
-
-   INIT(GL_LINE_LOOP);
-
-   if (start+1 < count) {
-      if (TEST_PRIM_BEGIN(flags)) {
-	 RESET_STIPPLE;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_LINE( ELT(start), ELT(start+1) );
-         else
-            RENDER_LINE( ELT(start+1), ELT(start) );
-      }
-
-      for ( i = start+2 ; i < count ; i++) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_LINE( ELT(i-1), ELT(i) );
-         else
-            RENDER_LINE( ELT(i), ELT(i-1) );
-      }
-
-      if ( TEST_PRIM_END(flags)) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_LINE( ELT(count-1), ELT(start) );
-         else
-            RENDER_LINE( ELT(start), ELT(count-1) );
-      }
-   }
-
-   POSTFIX;
-}
-
-
-static void TAG(render_triangles)( GLcontext *ctx,
-				   GLuint start,
-				   GLuint count,
-				   GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_TRIANGLES);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+2; j<count; j+=3) {
-	 /* Leave the edgeflags as supplied by the user.
-	  */
-	 RESET_STIPPLE;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );
-      }
-   } else {
-      for (j=start+2; j<count; j+=3) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );
-      }
-   }
-   POSTFIX;
-}
-
-
-
-static void TAG(render_tri_strip)( GLcontext *ctx,
-				   GLuint start,
-				   GLuint count,
-				   GLuint flags )
-{
-   GLuint j;
-   GLuint parity = 0;
-   LOCAL_VARS;
-
-   INIT(GL_TRIANGLE_STRIP);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+2;j<count;j++,parity^=1) {
-         GLuint ej2, ej1, ej;
-         GLboolean ef2, ef1, ef;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT) {
-            ej2 = ELT(j-2+parity);
-            ej1 = ELT(j-1-parity);
-            ej = ELT(j);
-         }
-         else {
-            ej2 = ELT(j-1+parity);
-            ej1 = ELT(j-parity);
-            ej = ELT(j-2);
-         }
-	 ef2 = EDGEFLAG_GET( ej2 );
-	 ef1 = EDGEFLAG_GET( ej1 );
-	 ef = EDGEFLAG_GET( ej );
-	 if (TEST_PRIM_BEGIN(flags)) {
-	    RESET_STIPPLE;
-	 }
-	 EDGEFLAG_SET( ej2, GL_TRUE );
-	 EDGEFLAG_SET( ej1, GL_TRUE );
-	 EDGEFLAG_SET( ej, GL_TRUE );
-         RENDER_TRI( ej2, ej1, ej );
-	 EDGEFLAG_SET( ej2, ef2 );
-	 EDGEFLAG_SET( ej1, ef1 );
-	 EDGEFLAG_SET( ej, ef );
-      }
-   } else {
-      for (j=start+2; j<count ; j++, parity^=1) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );
-         else
-            RENDER_TRI( ELT(j-1+parity), ELT(j-parity), ELT(j-2) );
-      }
-   }
-   POSTFIX;
-}
-
-
-static void TAG(render_tri_fan)( GLcontext *ctx,
-				 GLuint start,
-				 GLuint count,
-				 GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_TRIANGLE_FAN);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+2;j<count;j++) {
-	 /* For trifans, all edges are boundary.
-	  */
-	 GLuint ejs = ELT(start);
-	 GLuint ej1 = ELT(j-1);
-	 GLuint ej = ELT(j);
-	 GLboolean efs = EDGEFLAG_GET( ejs );
-	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
-	 GLboolean ef = EDGEFLAG_GET( ej );
-	 if (TEST_PRIM_BEGIN(flags)) {
-	    RESET_STIPPLE;
-	 }
-	 EDGEFLAG_SET( ejs, GL_TRUE );
-	 EDGEFLAG_SET( ej1, GL_TRUE );
-	 EDGEFLAG_SET( ej, GL_TRUE );
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ejs, ej1, ej);
-         else
-            RENDER_TRI( ej, ejs, ej1);
-	 EDGEFLAG_SET( ejs, efs );
-	 EDGEFLAG_SET( ej1, ef1 );
-	 EDGEFLAG_SET( ej, ef );
-      }
-   } else {
-      for (j=start+2;j<count;j++) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );
-         else
-            RENDER_TRI( ELT(j), ELT(start), ELT(j-1) );
-      }
-   }
-
-   POSTFIX;
-}
-
-
-static void TAG(render_poly)( GLcontext *ctx,
-			      GLuint start,
-			      GLuint count,
-			      GLuint flags )
-{
-   GLuint j = start+2;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_POLYGON);
-   if (NEED_EDGEFLAG_SETUP) {
-      GLboolean efstart = EDGEFLAG_GET( ELT(start) );
-      GLboolean efcount = EDGEFLAG_GET( ELT(count-1) );
-
-      /* If the primitive does not begin here, the first edge
-       * is non-boundary.
-       */
-      if (!TEST_PRIM_BEGIN(flags))
-	 EDGEFLAG_SET( ELT(start), GL_FALSE );
-      else {
-	 RESET_STIPPLE;
-      }
-
-      /* If the primitive does not end here, the final edge is
-       * non-boundary.
-       */
-      if (!TEST_PRIM_END(flags))
-	 EDGEFLAG_SET( ELT(count-1), GL_FALSE );
-
-      /* Draw the first triangles (possibly zero)
-       */
-      if (j+1<count) {
-	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
-	 EDGEFLAG_SET( ELT(j), GL_FALSE );
-	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-	 EDGEFLAG_SET( ELT(j), ef );
-	 j++;
-
-	 /* Don't render the first edge again:
-	  */
-	 EDGEFLAG_SET( ELT(start), GL_FALSE );
-
-	 for (;j+1<count;j++) {
-	    GLboolean efj = EDGEFLAG_GET( ELT(j) );
-	    EDGEFLAG_SET( ELT(j), GL_FALSE );
-	    RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-	    EDGEFLAG_SET( ELT(j), efj );
-	 }
-      }
-
-      /* Draw the last or only triangle
-       */
-      if (j < count)
-	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-
-      /* Restore the first and last edgeflags:
-       */
-      EDGEFLAG_SET( ELT(count-1), efcount );
-      EDGEFLAG_SET( ELT(start), efstart );
-
-   }
-   else {
-      for (j=start+2;j<count;j++) {
-	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-      }
-   }
-   POSTFIX;
-}
-
-static void TAG(render_quads)( GLcontext *ctx,
-			       GLuint start,
-			       GLuint count,
-			       GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_QUADS);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+3; j<count; j+=4) {
-	 /* Use user-specified edgeflags for quads.
-	  */
-	 RESET_STIPPLE;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );
-      }
-   } else {
-      for (j=start+3; j<count; j+=4) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );
-      }
-   }
-   POSTFIX;
-}
-
-static void TAG(render_quad_strip)( GLcontext *ctx,
-				    GLuint start,
-				    GLuint count,
-				    GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_QUAD_STRIP);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+3;j<count;j+=2) {
-	 /* All edges are boundary.  Set edgeflags to 1, draw the
-	  * quad, and restore them to the original values.
-	  */
-	 GLboolean ef3 = EDGEFLAG_GET( ELT(j-3) );
-	 GLboolean ef2 = EDGEFLAG_GET( ELT(j-2) );
-	 GLboolean ef1 = EDGEFLAG_GET( ELT(j-1) );
-	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
-	 if (TEST_PRIM_BEGIN(flags)) {
-	    RESET_STIPPLE;
-	 }
-	 EDGEFLAG_SET( ELT(j-3), GL_TRUE );
-	 EDGEFLAG_SET( ELT(j-2), GL_TRUE );
-	 EDGEFLAG_SET( ELT(j-1), GL_TRUE );
-	 EDGEFLAG_SET( ELT(j), GL_TRUE );
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );
-	 EDGEFLAG_SET( ELT(j-3), ef3 );
-	 EDGEFLAG_SET( ELT(j-2), ef2 );
-	 EDGEFLAG_SET( ELT(j-1), ef1 );
-	 EDGEFLAG_SET( ELT(j), ef );
-      }
-   } else {
-      for (j=start+3;j<count;j+=2) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );
-      }
-   }
-   POSTFIX;
-}
-
-static void TAG(render_noop)( GLcontext *ctx,
-			      GLuint start,
-			      GLuint count,
-			      GLuint flags )
-{
-   (void)(ctx && start && count && flags);
-}
-
-RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(GLcontext *,
-							   GLuint,
-							   GLuint,
-							   GLuint) =
-{
-   TAG(render_points),
-   TAG(render_lines),
-   TAG(render_line_loop),
-   TAG(render_line_strip),
-   TAG(render_triangles),
-   TAG(render_tri_strip),
-   TAG(render_tri_fan),
-   TAG(render_quads),
-   TAG(render_quad_strip),
-   TAG(render_poly),
-   TAG(render_noop),
-};
-
-
-
-#ifndef PRESERVE_VB_DEFS
-#undef RENDER_TRI
-#undef RENDER_QUAD
-#undef RENDER_LINE
-#undef RENDER_POINTS
-#undef LOCAL_VARS
-#undef INIT
-#undef POSTFIX
-#undef RESET_STIPPLE
-#undef DBG
-#undef ELT
-#undef RENDER_TAB_QUALIFIER
-#endif
-
-#ifndef PRESERVE_TAG
-#undef TAG
-#endif
-
-#undef PRESERVE_VB_DEFS
-#undef PRESERVE_TAG
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#ifndef POSTFIX

+#define POSTFIX

+#endif

+

+#ifndef INIT

+#define INIT(x)

+#endif

+

+#ifndef NEED_EDGEFLAG_SETUP

+#define NEED_EDGEFLAG_SETUP 0

+#define EDGEFLAG_GET(a) 0

+#define EDGEFLAG_SET(a,b) (void)b

+#endif

+

+#ifndef RESET_STIPPLE

+#define RESET_STIPPLE

+#endif

+

+#ifndef TEST_PRIM_END

+#define TEST_PRIM_END(prim) (flags & PRIM_END)

+#define TEST_PRIM_BEGIN(prim) (flags & PRIM_BEGIN)

+#endif

+

+#ifndef ELT

+#define ELT(x) x

+#endif

+

+#ifndef RENDER_TAB_QUALIFIER

+#define RENDER_TAB_QUALIFIER static

+#endif

+

+static void TAG(render_points)( struct gl_context *ctx,

+				GLuint start,

+				GLuint count,

+				GLuint flags )

+{

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_POINTS);

+   RENDER_POINTS( start, count );

+   POSTFIX;

+}

+

+static void TAG(render_lines)( struct gl_context *ctx,

+			       GLuint start,

+			       GLuint count,

+			       GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_LINES);

+   for (j=start+1; j<count; j+=2 ) {

+      RESET_STIPPLE;

+      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+         RENDER_LINE( ELT(j-1), ELT(j) );

+      else

+         RENDER_LINE( ELT(j), ELT(j-1) );

+   }

+   POSTFIX;

+}

+

+

+static void TAG(render_line_strip)( struct gl_context *ctx,

+				    GLuint start,

+				    GLuint count,

+				    GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_LINE_STRIP);

+

+   if (TEST_PRIM_BEGIN(flags)) {

+      RESET_STIPPLE;

+   }

+

+   for (j=start+1; j<count; j++ ) {

+      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+         RENDER_LINE( ELT(j-1), ELT(j) );

+      else

+         RENDER_LINE( ELT(j), ELT(j-1) );

+   }

+   POSTFIX;

+}

+

+

+static void TAG(render_line_loop)( struct gl_context *ctx,

+				   GLuint start,

+				   GLuint count,

+				   GLuint flags )

+{

+   GLuint i;

+   LOCAL_VARS;

+

+   (void) flags;

+

+   INIT(GL_LINE_LOOP);

+

+   if (start+1 < count) {

+      if (TEST_PRIM_BEGIN(flags)) {

+	 RESET_STIPPLE;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_LINE( ELT(start), ELT(start+1) );

+         else

+            RENDER_LINE( ELT(start+1), ELT(start) );

+      }

+

+      for ( i = start+2 ; i < count ; i++) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_LINE( ELT(i-1), ELT(i) );

+         else

+            RENDER_LINE( ELT(i), ELT(i-1) );

+      }

+

+      if ( TEST_PRIM_END(flags)) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_LINE( ELT(count-1), ELT(start) );

+         else

+            RENDER_LINE( ELT(start), ELT(count-1) );

+      }

+   }

+

+   POSTFIX;

+}

+

+

+static void TAG(render_triangles)( struct gl_context *ctx,

+				   GLuint start,

+				   GLuint count,

+				   GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_TRIANGLES);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+2; j<count; j+=3) {

+	 /* Leave the edgeflags as supplied by the user.

+	  */

+	 RESET_STIPPLE;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );

+      }

+   } else {

+      for (j=start+2; j<count; j+=3) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );

+      }

+   }

+   POSTFIX;

+}

+

+

+

+static void TAG(render_tri_strip)( struct gl_context *ctx,

+				   GLuint start,

+				   GLuint count,

+				   GLuint flags )

+{

+   GLuint j;

+   GLuint parity = 0;

+   LOCAL_VARS;

+

+   INIT(GL_TRIANGLE_STRIP);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+2;j<count;j++,parity^=1) {

+         GLuint ej2, ej1, ej;

+         GLboolean ef2, ef1, ef;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT) {

+            ej2 = ELT(j-2+parity);

+            ej1 = ELT(j-1-parity);

+            ej = ELT(j);

+         }

+         else {

+            ej2 = ELT(j-1+parity);

+            ej1 = ELT(j-parity);

+            ej = ELT(j-2);

+         }

+	 ef2 = EDGEFLAG_GET( ej2 );

+	 ef1 = EDGEFLAG_GET( ej1 );

+	 ef = EDGEFLAG_GET( ej );

+	 if (TEST_PRIM_BEGIN(flags)) {

+	    RESET_STIPPLE;

+	 }

+	 EDGEFLAG_SET( ej2, GL_TRUE );

+	 EDGEFLAG_SET( ej1, GL_TRUE );

+	 EDGEFLAG_SET( ej, GL_TRUE );

+         RENDER_TRI( ej2, ej1, ej );

+	 EDGEFLAG_SET( ej2, ef2 );

+	 EDGEFLAG_SET( ej1, ef1 );

+	 EDGEFLAG_SET( ej, ef );

+      }

+   } else {

+      for (j=start+2; j<count ; j++, parity^=1) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );

+         else

+            RENDER_TRI( ELT(j-1+parity), ELT(j-parity), ELT(j-2) );

+      }

+   }

+   POSTFIX;

+}

+

+

+static void TAG(render_tri_fan)( struct gl_context *ctx,

+				 GLuint start,

+				 GLuint count,

+				 GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_TRIANGLE_FAN);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+2;j<count;j++) {

+	 /* For trifans, all edges are boundary.

+	  */

+	 GLuint ejs = ELT(start);

+	 GLuint ej1 = ELT(j-1);

+	 GLuint ej = ELT(j);

+	 GLboolean efs = EDGEFLAG_GET( ejs );

+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );

+	 GLboolean ef = EDGEFLAG_GET( ej );

+	 if (TEST_PRIM_BEGIN(flags)) {

+	    RESET_STIPPLE;

+	 }

+	 EDGEFLAG_SET( ejs, GL_TRUE );

+	 EDGEFLAG_SET( ej1, GL_TRUE );

+	 EDGEFLAG_SET( ej, GL_TRUE );

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ejs, ej1, ej);

+         else

+            RENDER_TRI( ej, ejs, ej1);

+	 EDGEFLAG_SET( ejs, efs );

+	 EDGEFLAG_SET( ej1, ef1 );

+	 EDGEFLAG_SET( ej, ef );

+      }

+   } else {

+      for (j=start+2;j<count;j++) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );

+         else

+            RENDER_TRI( ELT(j), ELT(start), ELT(j-1) );

+      }

+   }

+

+   POSTFIX;

+}

+

+

+static void TAG(render_poly)( struct gl_context *ctx,

+			      GLuint start,

+			      GLuint count,

+			      GLuint flags )

+{

+   GLuint j = start+2;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_POLYGON);

+   if (NEED_EDGEFLAG_SETUP) {

+      GLboolean efstart = EDGEFLAG_GET( ELT(start) );

+      GLboolean efcount = EDGEFLAG_GET( ELT(count-1) );

+

+      /* If the primitive does not begin here, the first edge

+       * is non-boundary.

+       */

+      if (!TEST_PRIM_BEGIN(flags))

+	 EDGEFLAG_SET( ELT(start), GL_FALSE );

+      else {

+	 RESET_STIPPLE;

+      }

+

+      /* If the primitive does not end here, the final edge is

+       * non-boundary.

+       */

+      if (!TEST_PRIM_END(flags))

+	 EDGEFLAG_SET( ELT(count-1), GL_FALSE );

+

+      /* Draw the first triangles (possibly zero)

+       */

+      if (j+1<count) {

+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );

+	 EDGEFLAG_SET( ELT(j), GL_FALSE );

+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+	 EDGEFLAG_SET( ELT(j), ef );

+	 j++;

+

+	 /* Don't render the first edge again:

+	  */

+	 EDGEFLAG_SET( ELT(start), GL_FALSE );

+

+	 for (;j+1<count;j++) {

+	    GLboolean efj = EDGEFLAG_GET( ELT(j) );

+	    EDGEFLAG_SET( ELT(j), GL_FALSE );

+	    RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+	    EDGEFLAG_SET( ELT(j), efj );

+	 }

+      }

+

+      /* Draw the last or only triangle

+       */

+      if (j < count)

+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+

+      /* Restore the first and last edgeflags:

+       */

+      EDGEFLAG_SET( ELT(count-1), efcount );

+      EDGEFLAG_SET( ELT(start), efstart );

+

+   }

+   else {

+      for (j=start+2;j<count;j++) {

+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+      }

+   }

+   POSTFIX;

+}

+

+static void TAG(render_quads)( struct gl_context *ctx,

+			       GLuint start,

+			       GLuint count,

+			       GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_QUADS);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+3; j<count; j+=4) {

+	 /* Use user-specified edgeflags for quads.

+	  */

+	 RESET_STIPPLE;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );

+      }

+   } else {

+      for (j=start+3; j<count; j+=4) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );

+      }

+   }

+   POSTFIX;

+}

+

+static void TAG(render_quad_strip)( struct gl_context *ctx,

+				    GLuint start,

+				    GLuint count,

+				    GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_QUAD_STRIP);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+3;j<count;j+=2) {

+	 /* All edges are boundary.  Set edgeflags to 1, draw the

+	  * quad, and restore them to the original values.

+	  */

+	 GLboolean ef3 = EDGEFLAG_GET( ELT(j-3) );

+	 GLboolean ef2 = EDGEFLAG_GET( ELT(j-2) );

+	 GLboolean ef1 = EDGEFLAG_GET( ELT(j-1) );

+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );

+	 if (TEST_PRIM_BEGIN(flags)) {

+	    RESET_STIPPLE;

+	 }

+	 EDGEFLAG_SET( ELT(j-3), GL_TRUE );

+	 EDGEFLAG_SET( ELT(j-2), GL_TRUE );

+	 EDGEFLAG_SET( ELT(j-1), GL_TRUE );

+	 EDGEFLAG_SET( ELT(j), GL_TRUE );

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );

+	 EDGEFLAG_SET( ELT(j-3), ef3 );

+	 EDGEFLAG_SET( ELT(j-2), ef2 );

+	 EDGEFLAG_SET( ELT(j-1), ef1 );

+	 EDGEFLAG_SET( ELT(j), ef );

+      }

+   } else {

+      for (j=start+3;j<count;j+=2) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );

+      }

+   }

+   POSTFIX;

+}

+

+static void TAG(render_noop)( struct gl_context *ctx,

+			      GLuint start,

+			      GLuint count,

+			      GLuint flags )

+{

+   (void)(ctx && start && count && flags);

+}

+

+RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(struct gl_context *,

+							   GLuint,

+							   GLuint,

+							   GLuint) =

+{

+   TAG(render_points),

+   TAG(render_lines),

+   TAG(render_line_loop),

+   TAG(render_line_strip),

+   TAG(render_triangles),

+   TAG(render_tri_strip),

+   TAG(render_tri_fan),

+   TAG(render_quads),

+   TAG(render_quad_strip),

+   TAG(render_poly),

+   TAG(render_noop),

+};

+

+

+

+#ifndef PRESERVE_VB_DEFS

+#undef RENDER_TRI

+#undef RENDER_QUAD

+#undef RENDER_LINE

+#undef RENDER_POINTS

+#undef LOCAL_VARS

+#undef INIT

+#undef POSTFIX

+#undef RESET_STIPPLE

+#undef DBG

+#undef ELT

+#undef RENDER_TAB_QUALIFIER

+#endif

+

+#ifndef PRESERVE_TAG

+#undef TAG

+#endif

+

+#undef PRESERVE_VB_DEFS

+#undef PRESERVE_TAG