From a852378a6289d154364dde440f89a39bbfc33e2d Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 19 Nov 2000 23:10:25 +0000
Subject: Replaced Texture.CurrentD[] with separate Texture.Current1/2/3D vars.
 Completely removed the dirty texture object list.  Set texObj->Complete to
 GL_FALSE to indicate dirty. Made point/line/triangle/quad SWvertex parameters
 const. Minor code clean-ups.

---
 src/mesa/drivers/osmesa/osmesa.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/mesa/drivers/osmesa')

diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 9f7280564c..3f9a3626b1 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.32 2000/11/17 21:01:40 brianp Exp $ */
+/* $Id: osmesa.c,v 1.33 2000/11/19 23:10:26 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1239,7 +1239,7 @@ static void read_index_pixels( const GLcontext *ctx,
  * Draw a flat-shaded, RGB line into an osmesa buffer.
  */
 static void flat_rgba_line( GLcontext *ctx,
-                            SWvertex *vert0, SWvertex *vert1 )
+                            const SWvertex *vert0, const SWvertex *vert1 )
 {
    OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
    GLubyte *color = vert0->color;
@@ -1261,7 +1261,7 @@ static void flat_rgba_line( GLcontext *ctx,
  * Draw a flat-shaded, Z-less, RGB line into an osmesa buffer.
  */
 static void flat_rgba_z_line( GLcontext *ctx,
-			      SWvertex *vert0, SWvertex *vert1 )
+			      const SWvertex *vert0, const SWvertex *vert1 )
 {
    OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
    GLubyte *color = vert0->color;
@@ -1290,7 +1290,7 @@ static void flat_rgba_z_line( GLcontext *ctx,
  * Draw a flat-shaded, alpha-blended, RGB line into an osmesa buffer.
  */
 static void flat_blend_rgba_line( GLcontext *ctx,
-				  SWvertex *vert0, SWvertex *vert1 )
+				  const SWvertex *vert0, const SWvertex *vert1 )
 {
    OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
    GLint rshift = osmesa->rshift;
@@ -1325,7 +1325,7 @@ static void flat_blend_rgba_line( GLcontext *ctx,
  * Draw a flat-shaded, Z-less, alpha-blended, RGB line into an osmesa buffer.
  */
 static void flat_blend_rgba_z_line( GLcontext *ctx,
-				    SWvertex *vert0, SWvertex *vert1 )
+				    const SWvertex *vert0, const SWvertex *vert1 )
 {
    OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
    GLint rshift = osmesa->rshift;
@@ -1363,7 +1363,7 @@ static void flat_blend_rgba_z_line( GLcontext *ctx,
  * Draw a flat-shaded, Z-less, alpha-blended, RGB line into an osmesa buffer.
  */
 static void flat_blend_rgba_z_line_write( GLcontext *ctx,
-					  SWvertex *vert0, SWvertex *vert1 )
+					  const SWvertex *vert0, const SWvertex *vert1 )
 {
    OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
    GLint rshift = osmesa->rshift;
@@ -1509,7 +1509,9 @@ osmesa_choose_line_function( GLcontext *ctx )
  * Smooth-shaded, z-less triangle, RGBA color.
  */
 static void smooth_rgba_z_triangle( GLcontext *ctx, 
-				    SWvertex *v0, SWvertex *v1, SWvertex *v2 )
+				    const SWvertex *v0,
+                                    const SWvertex *v1,
+                                    const SWvertex *v2 )
 {
    OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
    GLint rshift = osmesa->rshift;
@@ -1551,7 +1553,9 @@ static void smooth_rgba_z_triangle( GLcontext *ctx,
  * Flat-shaded, z-less triangle, RGBA color.
  */
 static void flat_rgba_z_triangle( GLcontext *ctx, 
-				  SWvertex *v0, SWvertex *v1, SWvertex *v2 )
+				  const SWvertex *v0,
+                                  const SWvertex *v1,
+                                  const SWvertex *v2 )
 {
    OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
 #define INTERP_Z 1
-- 
cgit v1.2.3