Reinstate vertex format after a rasterization fallback for both r200 and radeon drive...

diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c
index 58879a59011f12889d8af07d00ba5faada2460f8..7ab3f7cd032ff650034b66fbb20ae6239f438487 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_swtcl.c
+++ b/src/mesa/drivers/dri/r200/r200_swtcl.c
@@ -717,6 +717,9 @@ void r200Fallback( GLcontext *ctx, GLuint bit, GLboolean mode )
             * zero above. But not if it doesn't (R200_NO_TCL for
             * example?)
             */
+           _tnl_invalidate_vertex_state( ctx, ~0 );
+           _tnl_invalidate_vertices( ctx, ~0 );
+           rmesa->tnl_index = 0;
            r200ChooseVertexState( ctx );
            r200ChooseRenderState( ctx );
         }

diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
index 1a737ebe6122005ba9d0a3d9af0f152b2b6d5345..9924931e1a2a42d8d825a1fe77f58c96beffc603 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
@@ -936,6 +936,9 @@ void radeonFallback( GLcontext *ctx, GLuint bit, GLboolean mode )
             * zero above. But not if it doesn't (RADEON_NO_TCL for
             * example?)
             */
+           _tnl_invalidate_vertex_state( ctx, ~0 );
+           _tnl_invalidate_vertices( ctx, ~0 );
+           rmesa->tnl_index = 0;
            radeonChooseVertexState( ctx );
            radeonChooseRenderState( ctx );
         }