Replaced struct gl_visual with struct __GLcontextModesRec from glcore.h.

Replace "RGBAMode" with "rgbMode", etc.
Other minor clean-ups.

3 files changed, 6 insertions, 4 deletions

diff --git a/src/mesa/swrast_setup/ss_triangle.c b/src/mesa/swrast_setup/ss_triangle.c
index 337a45acc53..3ed8c97fb6a 100644
--- a/src/mesa/swrast_setup/ss_triangle.c
+++ b/src/mesa/swrast_setup/ss_triangle.c
@@ -271,7 +271,7 @@ void _swsetup_choose_trifuncs( GLcontext *ctx )
    if (ctx->_TriangleCaps & DD_TRI_UNFILLED)
       ind |= SS_UNFILLED_BIT;
 
-   if (ctx->Visual.RGBAflag) 
+   if (ctx->Visual.rgbMode)
       ind |= SS_RGBA_BIT;
 
    swsetup->Triangle = tri_tab[ind];
diff --git a/src/mesa/swrast_setup/ss_tritmp.h b/src/mesa/swrast_setup/ss_tritmp.h
index cc0c511c35c..6064bbb5e02 100644
--- a/src/mesa/swrast_setup/ss_tritmp.h
+++ b/src/mesa/swrast_setup/ss_tritmp.h
@@ -95,6 +95,8 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
 	    if (bc < 0.0f) bc = -bc;
 	    offset += MAX2(ac, bc) * ctx->Polygon.OffsetFactor;
 	 }
+         offset *= ctx->MRD;
+         /*printf("offset %g\n", offset);*/
       }
    }
 
diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c
index d2cfc6a4f98..266a9dfca49 100644
--- a/src/mesa/swrast_setup/ss_vb.c
+++ b/src/mesa/swrast_setup/ss_vb.c
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  3.5
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  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"),
@@ -264,7 +264,7 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx)
    int funcindex = 0;
 
    if (ctx->RenderMode == GL_RENDER) {
-      if (ctx->Visual.RGBAflag) {
+      if (ctx->Visual.rgbMode) {
          funcindex = COLOR;
 
          if (ctx->Texture._ReallyEnabled & ~0xf) 
@@ -287,7 +287,7 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx)
 	 funcindex |= FOG;
    }
    else if (ctx->RenderMode == GL_FEEDBACK) {
-      if (ctx->Visual.RGBAflag) 
+      if (ctx->Visual.rgbMode) 
 	 funcindex = (COLOR | TEX0); /* is feedback color subject to fogging? */
       else
 	 funcindex = (INDEX | TEX0);