From 2be79c1aa2c168b7ecfb8289ce462ffb1de935eb Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 26 Aug 1999 14:50:49 +0000
Subject: various pipeline bugs

---
 src/mesa/drivers/glide/fxapi.c | 1 +
 src/mesa/drivers/glide/fxdd.c  | 8 ++++----
 src/mesa/drivers/glide/fxdrv.h | 8 ++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/mesa/drivers')

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index fbc586e757..82084e7479 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -948,6 +948,7 @@ fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,GrScreenResolution_t res
     fxMesa->haveTwoTMUs=GL_FALSE;
 
   if (getenv("FX_EMULATE_SINGLE_TMU")) {
+     fprint(stderr, "stadnnadna;lskdjf");
      if (MESA_VERBOSE&VERBOSE_DRIVER) 
        fprintf(stderr, "\n\nEmulating single tmu\n\n");
      fxMesa->haveTwoTMUs = GL_FALSE;
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index b2f3a7a43c..8fe8d809c0 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -513,6 +513,10 @@ static void fxDDUpdateDDPointers(GLcontext *ctx)
     if(new_state & INTERESTED) {
       fxDDChooseRenderState( ctx );
       fxMesa->RenderVBTables=fxDDChooseRenderVBTables(ctx);
+      fxMesa->RenderVBClippedTab=fxMesa->RenderVBTables[0];
+      fxMesa->RenderVBCulledTab=fxMesa->RenderVBTables[1];
+      fxMesa->RenderVBRawTab=fxMesa->RenderVBTables[2];
+
       ctx->Driver.RasterSetup=fxDDChooseSetupFunction(ctx);
     }
       
@@ -520,10 +524,6 @@ static void fxDDUpdateDDPointers(GLcontext *ctx)
     ctx->Driver.LineFunc=fxMesa->LineFunc;
     ctx->Driver.TriangleFunc=fxMesa->TriangleFunc;
     ctx->Driver.QuadFunc=fxMesa->QuadFunc;
-    ctx->Driver.RenderVBClippedTab=fxMesa->RenderVBTables[0];
-    ctx->Driver.RenderVBCulledTab=fxMesa->RenderVBTables[1];
-    ctx->Driver.RenderVBRawTab=fxMesa->RenderVBTables[2];
-
   }
 
   ctx->Driver.AllocDepthBuffer=fxAllocDepthBuffer;
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index bb8f5b8761..435d4ce741 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -420,6 +420,11 @@ struct tfxMesaContext {
 
   render_func **RenderVBTables;
 
+  render_func *RenderVBClippedTab;
+  render_func *RenderVBCulledTab;
+  render_func *RenderVBRawTab;
+
+
   tfxStats stats;
 
   void *state;
@@ -570,7 +575,10 @@ extern void fxDDShadeModel(GLcontext *ctx, GLenum mode);
 extern void fxDDCullFace(GLcontext *ctx, GLenum mode);
 extern void fxDDFrontFace(GLcontext *ctx, GLenum mode);
 
+extern void fxPrintRenderState( const char *msg, GLuint state );
+extern void fxPrintHintState( const char *msg, GLuint state );
 
+extern void fxDDDoRenderVB( struct vertex_buffer *VB );
 
 
 #endif
-- 
cgit v1.2.3