Merge branch 'mesa_7_7_branch'

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

diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
index 5ba6920804e2a63dd9b28e99036b01a85ebc6f89..e5885782c7a053a6c284a2b66af5554766165cf4 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_dmatmp.h
+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -27,7 +26,9 @@
  */
 
 
-/* Template for render stages which build and emit vertices directly
+/**
+ * \file t_dd_dmatmp.h
+ * Template for render stages which build and emit vertices directly
  * to fixed-size dma buffers.  Useful for rendering strips and other
  * native primitives where clipping and per-vertex tweaks such as
  * those in t_dd_tritmp.h are not required.
@@ -36,8 +37,6 @@
  * Where various primitive types are unaccelerated by hardware, the
  * code attempts to fallback to other primitive types (quadstrips to
  * tristrips, lineloops to linestrips), or to indexed vertices.
- * Ultimately, a FALLBACK() macro is invoked if there is no way to
- * render the primitive natively.
  */
 
 #if !defined(HAVE_TRIANGLES)
@@ -403,7 +402,7 @@ static void TAG(render_poly_verts)( GLcontext *ctx,
 
       FLUSH();
    }
-   else if (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE)) {
+   else if (HAVE_TRI_FANS && ctx->Light.ShadeModel == GL_SMOOTH) {
       TAG(render_tri_fan_verts)( ctx, start, count, flags );
    } else {
       fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
@@ -442,7 +441,9 @@ static void TAG(render_quad_strip_verts)( GLcontext *ctx,
 
       FLUSH();
 
-   } else if (HAVE_TRI_STRIPS && (ctx->_TriangleCaps & DD_FLATSHADE)) {
+   } else if (HAVE_TRI_STRIPS && 
+             ctx->Light.ShadeModel == GL_FLAT &&
+             TNL_CONTEXT(ctx)->vb.AttribPtr[_TNL_ATTRIB_COLOR0]->stride) {
       if (HAVE_ELTS) {
         LOCAL_VARS;
         int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
@@ -492,8 +493,8 @@ static void TAG(render_quad_strip_verts)( GLcontext *ctx,
         FLUSH();
       }
       else {
-        /* Vertices won't fit in a single buffer or elts not available,
-         * VERT_FALLBACK.
+        /* Vertices won't fit in a single buffer or elts not
+         * available - should never happen.
          */
         fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
         return;
@@ -562,9 +563,8 @@ static void TAG(render_quads_verts)( GLcontext *ctx,
          TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
          currentsz = dmasz;
       }
-
-
-   } else if (HAVE_ELTS) {
+   }
+   else if (HAVE_ELTS) {
       /* Hardware doesn't have a quad primitive type -- try to
        * simulate it using indexed vertices and the triangle
        * primitive:
@@ -615,8 +615,29 @@ static void TAG(render_quads_verts)( GLcontext *ctx,
 
       RELEASE_ELT_VERTS();
    }
+   else if (HAVE_TRIANGLES) {
+      /* Hardware doesn't have a quad primitive type -- try to
+       * simulate it using triangle primitive.  This is a win for
+       * gears, but is it useful in the broader world?
+       */
+      LOCAL_VARS;
+      GLuint j;
+
+      INIT(GL_TRIANGLES);
+
+      for (j = start; j < count-3; j += 4) {
+        void *tmp = ALLOC_VERTS( 6 );
+        /* Send v0, v1, v3
+         */
+        tmp = EMIT_VERTS(ctx, j,     2, tmp);
+        tmp = EMIT_VERTS(ctx, j + 3, 1, tmp);
+        /* Send v1, v2, v3
+         */
+        tmp = EMIT_VERTS(ctx, j + 1, 3, tmp);
+      }
+   }
    else {
-      /* Vertices won't fit in a single buffer, fallback.
+      /* Vertices won't fit in a single buffer, should never happen.
        */
       fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
       return;
@@ -965,7 +986,7 @@ static void TAG(render_poly_elts)( GLcontext *ctx,
         FLUSH();
         currentsz = dmasz;
       }
-   } else if (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE)) {
+   } else if (HAVE_TRI_FANS && ctx->Light.ShadeModel == GL_SMOOTH) {
       TAG(render_tri_fan_verts)( ctx, start, count, flags );
    } else {
       fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
@@ -999,7 +1020,7 @@ static void TAG(render_quad_strip_elts)( GLcontext *ctx,
       if (currentsz < 12)
         currentsz = dmasz;
 
-      if (ctx->_TriangleCaps & DD_FLATSHADE) {
+      if (ctx->Light.ShadeModel == GL_FLAT) {
         ELT_INIT( GL_TRIANGLES );
 
         currentsz = currentsz/6*2;
@@ -1012,8 +1033,7 @@ static void TAG(render_quad_strip_elts)( GLcontext *ctx,
            {
               GLint i;
               GLint quads = (nr/2)-1;
-              void *buf = ALLOC_ELTS( quads*6 );
-              ELTS_VARS( buf );
+              ELTS_VARS( ALLOC_ELTS( quads*6 ) );
 
               for ( i = j-start ; i < j-start+quads ; i++, elts += 2 ) {
                  EMIT_TWO_ELTS( 0, elts[0], elts[1] );
@@ -1101,8 +1121,7 @@ static void TAG(render_quads_elts)( GLcontext *ctx,
         {
            GLint quads = nr/4;
            GLint i;
-           void *buf = ALLOC_ELTS( quads * 6 );
-           ELTS_VARS(buf);
+           ELTS_VARS( ALLOC_ELTS( quads * 6 ) );
 
            for ( i = j-start ; i < j-start+quads ; i++, elts += 4 ) {
               EMIT_TWO_ELTS( 0, elts[0], elts[1] );
@@ -1142,10 +1161,8 @@ static tnl_render_func TAG(render_tab_elts)[GL_POLYGON+2] =
 
 
 
-
-
-
-/* Prevent fallbacks later on.
+/* Pre-check the primitives in the VB to prevent the need for
+ * fallbacks later on.
  */
 static GLboolean TAG(validate_render)( GLcontext *ctx,
                                       struct vertex_buffer *VB )
@@ -1192,8 +1209,9 @@ static GLboolean TAG(validate_render)( GLcontext *ctx,
         if (HAVE_POLYGONS) {
            ok = GL_TRUE;
         }
-        else 
-           ok =  (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE));
+        else {
+           ok = (HAVE_TRI_FANS && ctx->Light.ShadeModel == GL_SMOOTH);
+         }
         break;
       case GL_QUAD_STRIP:
         if (VB->Elts) {
@@ -1201,9 +1219,11 @@ static GLboolean TAG(validate_render)( GLcontext *ctx,
         }
         else if (HAVE_QUAD_STRIPS) {
            ok = GL_TRUE;
-        } else if (HAVE_TRI_STRIPS && (ctx->_TriangleCaps & DD_FLATSHADE)) {
+        } else if (HAVE_TRI_STRIPS && 
+                   ctx->Light.ShadeModel == GL_FLAT &&
+                   VB->AttribPtr[_TNL_ATTRIB_COLOR0]->stride != 0) {
            if (HAVE_ELTS) {
-              ok = count < GET_SUBSEQUENT_VB_MAX_ELTS();
+              ok = (GLint) count < GET_SUBSEQUENT_VB_MAX_ELTS();
            }
            else {
               ok = GL_FALSE;
@@ -1216,17 +1236,20 @@ static GLboolean TAG(validate_render)( GLcontext *ctx,
         if (HAVE_QUADS) {
            ok = GL_TRUE;
         } else if (HAVE_ELTS) {
-           ok = count < GET_SUBSEQUENT_VB_MAX_ELTS();
+           ok = (GLint) count < GET_SUBSEQUENT_VB_MAX_ELTS();
         }
         else {
-           ok = GL_FALSE;
+           ok = HAVE_TRIANGLES; /* flatshading is ok. */
         }
         break;
       default:
         break;
       }
       
-      if (!ok) return GL_FALSE;
+      if (!ok) {
+/*      fprintf(stderr, "not ok %s\n", _mesa_lookup_enum_by_nr(prim & PRIM_MODE_MASK)); */
+        return GL_FALSE;
+      }
    }
 
    return GL_TRUE;