[[MESA]

[reactos.git] / reactos / dll / opengl / mesa / src / mesa / tnl / t_vb_rendertmp.h

diff --git a/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_rendertmp.h b/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_rendertmp.h
index 4ed485a..3a1eddb 100644 (file)
--- a/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_rendertmp.h
+++ b/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_rendertmp.h
@@ -82,10 +82,7 @@ static void TAG(render_lines)( struct gl_context *ctx,
    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) );
+      RENDER_LINE( ELT(j-1), ELT(j) );
    }
    POSTFIX;
 }
@@ -107,10 +104,7 @@ static void TAG(render_line_strip)( struct gl_context *ctx,
    }
 
    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) );
+      RENDER_LINE( ELT(j-1), ELT(j) );
    }
    POSTFIX;
 }
@@ -131,24 +125,15 @@ static void TAG(render_line_loop)( struct gl_context *ctx,
    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) );
+         RENDER_LINE( ELT(start), ELT(start+1) );
       }
 
       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) );
+         RENDER_LINE( ELT(i-1), ELT(i) );
       }
 
       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) );
+         RENDER_LINE( ELT(count-1), ELT(start) );
       }
    }
 
@@ -171,17 +156,11 @@ static void TAG(render_triangles)( struct gl_context *ctx,
         /* 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) );
+         RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
       }
    } 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) );
+         RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );         
       }
    }
    POSTFIX;
@@ -203,16 +182,9 @@ static void TAG(render_tri_strip)( struct gl_context *ctx,
       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);
-         }
+         ej2 = ELT(j-2+parity);
+         ej1 = ELT(j-1-parity);
+         ej = ELT(j);
         ef2 = EDGEFLAG_GET( ej2 );
         ef1 = EDGEFLAG_GET( ej1 );
         ef = EDGEFLAG_GET( ej );
@@ -229,10 +201,7 @@ static void TAG(render_tri_strip)( struct gl_context *ctx,
       }
    } 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) );
+         RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );
       }
    }
    POSTFIX;
@@ -265,20 +234,14 @@ static void TAG(render_tri_fan)( struct gl_context *ctx,
         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);
+     RENDER_TRI( ejs, ej1, ej);
         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) );
+         RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );
       }
    }
 
@@ -367,22 +330,14 @@ static void TAG(render_quads)( struct gl_context *ctx,
    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) );
+           /* Use user-specified edgeflags for quads.
+            */
+           RESET_STIPPLE;
+        RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
       }
    } 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) );
+         RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
       }
    }
    POSTFIX;
@@ -414,11 +369,7 @@ static void TAG(render_quad_strip)( struct gl_context *ctx,
         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) );
+     RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
         EDGEFLAG_SET( ELT(j-3), ef3 );
         EDGEFLAG_SET( ELT(j-2), ef2 );
         EDGEFLAG_SET( ELT(j-1), ef1 );
@@ -426,11 +377,7 @@ static void TAG(render_quad_strip)( struct gl_context *ctx,
       }
    } 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) );
+         RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
       }
    }
    POSTFIX;