Allow swrast to cope (fairly) cleanly with GL_SEPERATE_SPECULAR when

texturing is not enabled, and without requiring the two colors be
added externally.

As a part of this, collapsed the decomposition of quads into triangles
inside swrast to be hardwired into _swrast_Quad; removed s_quads.[ch].

Removed checks on texture state from t_vb_light.c, which was previously
required by swrast.

Moved the t_dd_ templates to a new directory.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mesa/swrast_setup/ss_vbtmp.h b/src/mesa/swrast_setup/ss_vbtmp.h
index ab5417ffe5..6197f5bdb5 100644
--- a/src/mesa/swrast_setup/ss_vbtmp.h
+++ b/src/mesa/swrast_setup/ss_vbtmp.h
@@ -78,6 +78,14 @@ static void TAG(rs)(GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs )
       }
    }
 
+   /* Tie up some dangling pointers for flat/twoside code in ss_tritmp.h
+    */
+   if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) == 0) {
+      VB->SecondaryColorPtr[0] = VB->ColorPtr[0];
+      VB->SecondaryColorPtr[1] = VB->ColorPtr[1];
+   }
+     
+
    proj = VB->ProjectedClipPtr->data;
    if (IND & FOG)
       fog = VB->FogCoordPtr->data;