glsl_to_ir: do lower_blend_equation if PIPE_CAP_FBFETCH

[mesa.git] / src / mesa / tnl_dd / t_dd_tritmp.h

diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h
index 0341399fe3a4740e36f921a88b4804437a35a080..2294a76a65cb217e37d78a873123b0fa3bd1b394 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_tritmp.h
+++ b/src/mesa/tnl_dd/t_dd_tritmp.h
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 
@@ -121,7 +121,7 @@ static void TAG(triangle)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint
    GLuint facing = 0;
    LOCAL_VARS(3);
 
-/*     fprintf(stderr, "%s\n", __FUNCTION__); */
+/*     fprintf(stderr, "%s\n", __func__); */
 
    v[0] = (VERTEX *)GET_VERTEX(e0);
    v[1] = (VERTEX *)GET_VERTEX(e1);
@@ -137,7 +137,7 @@ static void TAG(triangle)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint
 
       if (DO_TWOSIDE || DO_UNFILLED || DO_TWOSTENCIL)
       {
-        facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
+        facing = AREA_IS_CCW( cc ) ^ _mesa_polygon_get_front_bit(ctx);
 
         if (DO_UNFILLED) {
            if (facing) {
@@ -187,7 +187,7 @@ static void TAG(triangle)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint
               VERT_SAVE_RGBA( 2 );
 
               if (VB->BackfaceColorPtr->stride) {
-                 ASSERT(VB->BackfaceColorPtr->stride == 4*sizeof(GLfloat));
+                 assert(VB->BackfaceColorPtr->stride == 4*sizeof(GLfloat));
 
                  if (!DO_FLAT) {
                     VERT_SET_RGBA( v[0], vbcolor[e0] );
@@ -205,7 +205,7 @@ static void TAG(triangle)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint
 
               if (HAVE_SPEC && VB->BackfaceSecondaryColorPtr) {
                  GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;
-                 ASSERT(VB->BackfaceSecondaryColorPtr->stride == 4*sizeof(GLfloat));
+                 assert(VB->BackfaceSecondaryColorPtr->stride == 4*sizeof(GLfloat));
 
                  if (!DO_FLAT) {
                     VERT_SAVE_SPEC( 0 );
@@ -362,7 +362,7 @@ static void TAG(quadr)( struct gl_context *ctx,
 
       if (DO_TWOSIDE || DO_UNFILLED || DO_TWOSTENCIL)
       {
-        facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
+        facing = AREA_IS_CCW( cc ) ^ _mesa_polygon_get_front_bit(ctx);
 
         if (DO_UNFILLED) {
            if (facing) {
@@ -435,7 +435,7 @@ static void TAG(quadr)( struct gl_context *ctx,
 
               if (HAVE_SPEC && VB->BackfaceSecondaryColorPtr) {
                  GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;
-                 ASSERT(VB->BackfaceSecondaryColorPtr->stride==4*sizeof(GLfloat));
+                 assert(VB->BackfaceSecondaryColorPtr->stride==4*sizeof(GLfloat));
 
                  if (!DO_FLAT) {
                     VERT_SAVE_SPEC( 0 );