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 2c36d845ab8875adab65a4cbb79d07f38b1f1a17..2294a76a65cb217e37d78a873123b0fa3bd1b394 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_tritmp.h
+++ b/src/mesa/tnl_dd/t_dd_tritmp.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
@@ -17,12 +16,13 @@
  * 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.
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 
@@ -111,7 +111,7 @@
 #endif
 
 #if DO_TRI
-static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
+static void TAG(triangle)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2 )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
    VERTEX *v[3];
@@ -121,7 +121,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
    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)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
 
       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)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
               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)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
 
               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 );
@@ -288,8 +288,9 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
         VERT_Z_ADD(v[1], offset);
         VERT_Z_ADD(v[2], offset);
       }
-      if (DO_UNFILLED)
+      if (DO_UNFILLED) {
         RASTERIZE( GL_TRIANGLES );
+      }
       if (DO_TWOSTENCIL && !HAVE_STENCIL_TWOSIDE && ctx->Stencil.TestTwoSide) {
          SETUP_STENCIL(facing);
          TRI( v[0], v[1], v[2] );
@@ -335,7 +336,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
 
 #if DO_QUAD
 #if DO_FULL_QUAD
-static void TAG(quadr)( GLcontext *ctx,
+static void TAG(quadr)( struct gl_context *ctx,
                       GLuint e0, GLuint e1, GLuint e2, GLuint e3 )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
@@ -361,7 +362,7 @@ static void TAG(quadr)( GLcontext *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) {
@@ -434,7 +435,7 @@ static void TAG(quadr)( GLcontext *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 );
@@ -575,7 +576,7 @@ static void TAG(quadr)( GLcontext *ctx,
    }
 }
 #else
-static void TAG(quadr)( GLcontext *ctx, GLuint e0,
+static void TAG(quadr)( struct gl_context *ctx, GLuint e0,
                       GLuint e1, GLuint e2, GLuint e3 )
 {
    if (DO_UNFILLED) {
@@ -597,7 +598,7 @@ static void TAG(quadr)( GLcontext *ctx, GLuint e0,
 #endif
 
 #if DO_LINE
-static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 )
+static void TAG(line)( struct gl_context *ctx, GLuint e0, GLuint e1 )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    VERTEX *v[2];
@@ -628,7 +629,7 @@ static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 )
 #endif
 
 #if DO_POINTS
-static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last )
+static void TAG(points)( struct gl_context *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
    GLuint i;