Fix texenv by moving a misplaced check for being in fallback (should cover only

render state, not texture state).  While here, move a SIS_FIREVERTICES to a more
appropriate location, though it was harmless.

diff --git a/src/mesa/drivers/dri/sis/sis_tris.c b/src/mesa/drivers/dri/sis/sis_tris.c
index 7deaa634d1cdbee04069c32796a1d0a39c5f1406..1c6d85a86a41993231728a78aa61068eb25e1d3d 100644 (file)
--- a/src/mesa/drivers/dri/sis/sis_tris.c
+++ b/src/mesa/drivers/dri/sis/sis_tris.c
@@ -622,6 +622,9 @@ static void sisChooseRenderState(GLcontext *ctx)
    GLuint flags = ctx->_TriangleCaps;
    GLuint index = 0;
 
+   if (smesa->Fallback)
+      return;
+
    if (flags & (ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS)) {
 
       if (flags & ANY_RASTER_FLAGS) {
@@ -716,9 +719,9 @@ static void sisRunPipeline( GLcontext *ctx )
 {
    sisContextPtr smesa = SIS_CONTEXT( ctx );
 
-   if (!smesa->Fallback && smesa->NewGLState) {
+   if (smesa->NewGLState) {
+      SIS_FIREVERTICES(smesa);
       if (smesa->NewGLState & _NEW_TEXTURE) {
-        SIS_FIREVERTICES(smesa);
         sisUpdateTextureState(ctx);
       }