Reinstate vertex format after a rasterization fallback for both r200 and radeon driver when a tcl fallback is active, fixes a blender issue with non-tcl hw (bug #5601)

2 files changed, 6 insertions, 0 deletions

diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c
index 58879a59011..7ab3f7cd032 100644
--- 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 1a737ebe612..9924931e1a2 100644
--- 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 );
 	 }