summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2001-01-13 07:13:28 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2001-01-13 07:13:28 +0000
commit8415686ea22bc9165720590261581ff997f2eb7a (patch)
tree368d9172e26b2c36d67008628f5aa7f35e1a7d5d /src/mesa
parent321f67c4729adeebd7aa9ef9e22c95e709952851 (diff)
Use correct pv in swrast lines routines
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_context.c14
-rw-r--r--src/mesa/swrast/s_lines.c18
-rw-r--r--src/mesa/swrast/swrast.h7
3 files changed, 16 insertions, 23 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index a1e30f5ccce..d02ef224423 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,4 +1,4 @@
-/* $Id: s_context.c,v 1.9 2000/12/27 19:57:37 keithw Exp $ */
+/* $Id: s_context.c,v 1.10 2001/01/13 07:13:28 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -350,6 +350,11 @@ _swrast_Quad( GLcontext *ctx,
const SWvertex *v0, const SWvertex *v1,
const SWvertex *v2, const SWvertex *v3 )
{
+/* fprintf(stderr, "%s\n", __FUNCTION__); */
+/* _swrast_print_vertex( ctx, v0 ); */
+/* _swrast_print_vertex( ctx, v1 ); */
+/* _swrast_print_vertex( ctx, v2 ); */
+/* _swrast_print_vertex( ctx, v3 ); */
SWRAST_CONTEXT(ctx)->Quad( ctx, v0, v1, v2, v3 );
}
@@ -387,13 +392,6 @@ _swrast_InvalidateState( GLcontext *ctx, GLuint new_state )
SWRAST_CONTEXT(ctx)->InvalidateState( ctx, new_state );
}
-
-GLuint *
-_swrast_get_stipple_counter_ref( GLcontext *ctx )
-{
- return &SWRAST_CONTEXT(ctx)->StippleCounter;
-}
-
void
_swrast_ResetLineStipple( GLcontext *ctx )
{
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c
index bec818c2494..da8b2db180e 100644
--- a/src/mesa/swrast/s_lines.c
+++ b/src/mesa/swrast/s_lines.c
@@ -1,4 +1,4 @@
-/* $Id: s_lines.c,v 1.8 2000/11/22 08:42:15 joukj Exp $ */
+/* $Id: s_lines.c,v 1.9 2001/01/13 07:13:28 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -95,7 +95,7 @@ static void flat_rgba_line( GLcontext *ctx,
const SWvertex *vert0,
const SWvertex *vert1 )
{
- const GLchan *color = vert0->color;
+ const GLchan *color = vert1->color;
struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
@@ -114,7 +114,7 @@ static void flat_rgba_z_line( GLcontext *ctx,
const SWvertex *vert0,
const SWvertex *vert1 )
{
- const GLchan *color = vert0->color;
+ const GLchan *color = vert1->color;
struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
@@ -534,7 +534,7 @@ static void general_flat_rgba_line( GLcontext *ctx,
const SWvertex *vert1 )
{
struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
- const GLchan *color = vert0->color;
+ const GLchan *color = vert1->color;
PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
if (ctx->Line.StippleFlag) {
@@ -586,7 +586,7 @@ static void flat_textured_line( GLcontext *ctx,
GLfloat *pbs = PB->s[0];
GLfloat *pbt = PB->t[0];
GLfloat *pbu = PB->u[0];
- GLchan *color = (GLchan*) vert0->color;
+ GLchan *color = (GLchan*) vert1->color;
PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
count = PB->count;
@@ -827,10 +827,10 @@ static void flat_multitextured_line( GLcontext *ctx,
GLfixed *pbfog = PB->fog;
GLchan (*pbrgba)[4] = PB->rgba;
GLchan (*pbspec)[3] = PB->spec;
- GLchan *color = (GLchan*) vert0->color;
- GLchan sRed = vert0->specular[0];
- GLchan sGreen = vert0->specular[1];
- GLchan sBlue = vert0->specular[2];
+ GLchan *color = (GLchan*) vert1->color;
+ GLchan sRed = vert1->specular[0];
+ GLchan sGreen = vert1->specular[1];
+ GLchan sBlue = vert1->specular[2];
PB->mono = GL_FALSE;
diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index 056435ee702..94b564d78e8 100644
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -119,12 +119,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op,
GLint width, GLint height );
-/* Get a pointer to the stipple counter.
- */
-extern GLuint *
-_swrast_get_stipple_counter_ref( GLcontext *ctx );
-
-/* Reset the stipple pointer via a function call
+/* Reset the stipple counter
*/
extern void
_swrast_ResetLineStipple( GLcontext *ctx );