More work on the tcl code... still have to make my mind on a number of

    things

1 files changed, 9 insertions, 5 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_tris.c b/src/mesa/drivers/dri/nouveau/nouveau_tris.c
index 53a18d2f73..8622b9349c 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_tris.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_tris.c
@@ -87,7 +87,7 @@ void nouveauFallback(struct nouveau_context *nmesa, GLuint bit, GLboolean mode)
 			}
 
 			_swsetup_Wakeup(ctx);
-			nmesa->renderIndex = ~0;
+			nmesa->render_index = ~0;
 		}
 	}
 	else {
@@ -95,14 +95,18 @@ void nouveauFallback(struct nouveau_context *nmesa, GLuint bit, GLboolean mode)
 		if (oldfallback == bit) {
 			_swrast_flush( ctx );
 
-			nouveauInitTriFunctions(ctx);
+			if (nmesa->screen->card_type<NV_10) {
+				//nv03TriInitFunctions(ctx);
+			} else {
+				nv10TriInitFunctions(ctx);
+			}
 
 			_tnl_invalidate_vertex_state( ctx, ~0 );
 			_tnl_invalidate_vertices( ctx, ~0 );
 			_tnl_install_attrs( ctx, 
 					nmesa->vertex_attrs, 
 					nmesa->vertex_attr_count,
-					nmesa->ViewportMatrix.m, 0 ); 
+					nmesa->viewport.m, 0 ); 
 		}
 	}    
 }
@@ -112,8 +116,8 @@ void nouveauRunPipeline( GLcontext *ctx )
 {
 	struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
 
-	if (nmesa->newState) {
-		nmesa->newRenderState |= nmesa->newState;
+	if (nmesa->new_state) {
+		nmesa->new_render_state |= nmesa->new_state;
 	}
 
 	_tnl_run_pipeline( ctx );