From 58e991705392a2e17a1c8b034f4083a0adaf1943 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 5 Jan 2001 02:26:48 +0000
Subject: Remove 'pv' parameter from Line/Tri/Point funcs.  The provoking
 vertex is always the last vertex parameter. Modify clipping to preserve pv
 colors. Modify swrast and X11 driver to expect the pv in the last vertex (was
 looking in the first vertex previously). Remove all handling of flatshading
 from swrast_setup.

Allow drivers to override the unclipped render tabs in tnl_render_stage
directly.  (Like in 3.4).  Removed fxsimplerender stage.

Modified t_vb_rendertmp.h to remove the need for 'parity' arguments
in RENDER_TRI macros.
---
 src/mesa/swrast/s_triangle.c | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'src/mesa/swrast/s_triangle.c')

diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 6c232cb694c..b61d4401e1b 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -1,4 +1,4 @@
-/* $Id: s_triangle.c,v 1.7 2000/12/12 00:31:45 brianp Exp $ */
+/* $Id: s_triangle.c,v 1.8 2001/01/05 02:26:49 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -160,7 +160,7 @@ static void flat_rgba_triangle( GLcontext *ctx,
 		 fffog += fdfogdx;				\
 	      }							\
               gl_write_monocolor_span( ctx, n, LEFT, Y, zspan,	\
-                                       fogspan, v0->color,	\
+                                       fogspan, v2->color,	\
 			               GL_POLYGON );		\
 	   }							\
 	}
@@ -1613,10 +1613,10 @@ static void general_textured_triangle( GLcontext *ctx,
    GLboolean flat_shade = (ctx->Light.ShadeModel==GL_FLAT);	\
    GLint r, g, b, a;						\
    if (flat_shade) {						\
-      r = v0->color[0];						\
-      g = v0->color[1];						\
-      b = v0->color[2];						\
-      a = v0->color[3];						\
+      r = v2->color[0];						\
+      g = v2->color[1];						\
+      b = v2->color[2];						\
+      a = v2->color[3];						\
    }
 #define INNER_LOOP( LEFT, RIGHT, Y )				\
 	{							\
@@ -1708,13 +1708,13 @@ static void general_textured_spec_triangle1( GLcontext *ctx,
    GLboolean flat_shade = (ctx->Light.ShadeModel==GL_FLAT);	\
    GLint r, g, b, a, sr, sg, sb;				\
    if (flat_shade) {						\
-      r = v0->color[0];						\
-      g = v0->color[1];						\
-      b = v0->color[2];						\
-      a = v0->color[3];						\
-      sr = v0->specular[0]; 					\
-      sg = v0->specular[1]; 					\
-      sb = v0->specular[2]; 					\
+      r = v2->color[0];						\
+      g = v2->color[1];						\
+      b = v2->color[2];						\
+      a = v2->color[3];						\
+      sr = v2->specular[0]; 					\
+      sg = v2->specular[1]; 					\
+      sb = v2->specular[2]; 					\
    }
 #define INNER_LOOP( LEFT, RIGHT, Y )				\
 	{							\
@@ -1837,10 +1837,10 @@ static void lambda_textured_triangle1( GLcontext *ctx,
    const GLboolean flat_shade = (ctx->Light.ShadeModel==GL_FLAT);	\
    GLint r, g, b, a;							\
    if (flat_shade) {							\
-      r = v0->color[0];							\
-      g = v0->color[1];							\
-      b = v0->color[2];							\
-      a = v0->color[3];							\
+      r = v2->color[0];							\
+      g = v2->color[1];							\
+      b = v2->color[2];							\
+      a = v2->color[3];							\
    }
 
 #define INNER_LOOP( LEFT, RIGHT, Y )					\
@@ -1942,13 +1942,13 @@ static void lambda_textured_spec_triangle1( GLcontext *ctx,
    const GLboolean flat_shade = (ctx->Light.ShadeModel==GL_FLAT);	\
    GLint r, g, b, a, sr, sg, sb;					\
    if (flat_shade) {							\
-      r = v0->color[0];							\
-      g = v0->color[1];							\
-      b = v0->color[2];							\
-      a = v0->color[3];							\
-      sr = v0->specular[0];						\
-      sg = v0->specular[1];						\
-      sb = v0->specular[2];						\
+      r = v2->color[0];							\
+      g = v2->color[1];							\
+      b = v2->color[2];							\
+      a = v2->color[3];							\
+      sr = v2->specular[0];						\
+      sg = v2->specular[1];						\
+      sb = v2->specular[2];						\
    }
 
 #define INNER_LOOP( LEFT, RIGHT, Y )					\
@@ -2055,10 +2055,10 @@ lambda_multitextured_triangle1( GLcontext *ctx,
    GLfloat twidth[MAX_TEXTURE_UNITS], theight[MAX_TEXTURE_UNITS];		\
    GLint r, g, b, a;								\
    if (flat_shade) {								\
-      r = v0->color[0];								\
-      g = v0->color[1];								\
-      b = v0->color[2];								\
-      a = v0->color[3];								\
+      r = v2->color[0];								\
+      g = v2->color[1];								\
+      b = v2->color[2];								\
+      a = v2->color[3];								\
    }										\
    {										\
       GLuint unit;								\
-- 
cgit v1.2.3