1 files changed, 6 insertions, 19 deletions

diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_state.c b/xc/lib/GL/mesa/src/drv/r128/r128_state.c
index 33ad025e4..b4a2b7f3f 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_state.c
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_state.c
@@ -852,7 +852,6 @@ static void r128DDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
    case GL_TEXTURE_2D:
    case GL_TEXTURE_3D:
       FLUSH_BATCH( rmesa );
-      rmesa->new_state |= R128_NEW_TEXTURE;
       break;
 
    case GL_POLYGON_STIPPLE:
@@ -884,7 +883,7 @@ static void r128DDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
 static void r128DDPrintDirty( const char *msg, GLuint state )
 {
    fprintf( stderr,
-	    "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s\n",
+	    "%s: (0x%x) %s%s%s%s%s%s%s%s%s\n",
 	    msg,
 	    state,
 	    (state & R128_UPLOAD_CORE)		? "core, " : "",
@@ -892,8 +891,6 @@ static void r128DDPrintDirty( const char *msg, GLuint state )
 	    (state & R128_UPLOAD_SETUP)		? "setup, " : "",
 	    (state & R128_UPLOAD_TEX0)		? "tex0, " : "",
 	    (state & R128_UPLOAD_TEX1)		? "tex1, " : "",
-	    (state & R128_UPLOAD_TEX0IMAGES)	? "tex0 images, " : "",
-	    (state & R128_UPLOAD_TEX1IMAGES)	? "tex1 images, " : "",
 	    (state & R128_UPLOAD_MASKS)		? "masks, " : "",
 	    (state & R128_UPLOAD_WINDOW)	? "window, " : "",
 	    (state & R128_UPLOAD_CLIPRECTS)	? "cliprects, " : "",
@@ -922,21 +919,11 @@ void r128EmitHwStateLocked( r128ContextPtr rmesa )
       r128DDPrintDirty( "r128EmitHwStateLocked", rmesa->dirty );
    }
 
-   if ( rmesa->dirty & R128_UPLOAD_TEX0IMAGES ) {
-      if ( t0 ) r128UploadTexImages( rmesa, t0 );
-      rmesa->dirty &= ~R128_UPLOAD_TEX0IMAGES;
-   }
-   if ( rmesa->dirty & R128_UPLOAD_TEX1IMAGES ) {
-      if ( t1 ) r128UploadTexImages( rmesa, t1 );
-      rmesa->dirty &= ~R128_UPLOAD_TEX1IMAGES;
-   }
-
    if ( rmesa->dirty & (R128_UPLOAD_CONTEXT |
 			R128_UPLOAD_SETUP |
 			R128_UPLOAD_MASKS |
 			R128_UPLOAD_WINDOW |
-			R128_UPLOAD_CORE |
-			R128_UPLOAD_TEX0) ) {
+			R128_UPLOAD_CORE) ) {
       memcpy( &sarea->ContextState, regs, sizeof(sarea->ContextState) );
    }
 
@@ -975,7 +962,7 @@ void r128EmitHwStateLocked( r128ContextPtr rmesa )
 static void r128DDPrintState( const char *msg, GLuint flags )
 {
    fprintf( stderr,
-	    "%s: (0x%x) %s%s%s%s%s%s%s%s%s\n",
+	    "%s: (0x%x) %s%s%s%s%s%s%s%s\n",
 	    msg,
 	    flags,
 	    (flags & R128_NEW_CONTEXT)	? "context, " : "",
@@ -983,7 +970,6 @@ static void r128DDPrintState( const char *msg, GLuint flags )
 	    (flags & R128_NEW_DEPTH)	? "depth, " : "",
 	    (flags & R128_NEW_FOG)	? "fog, " : "",
 	    (flags & R128_NEW_CLIP)	? "clip, " : "",
-	    (flags & R128_NEW_TEXTURE)	? "texture, " : "",
 	    (flags & R128_NEW_CULL)	? "cull, " : "",
 	    (flags & R128_NEW_MASKS)	? "masks, " : "",
 	    (flags & R128_NEW_WINDOW)	? "window, " : "" );
@@ -994,7 +980,7 @@ void r128DDUpdateHWState( GLcontext *ctx )
    r128ContextPtr rmesa = R128_CONTEXT(ctx);
    int new_state = rmesa->new_state;
 
-   if ( new_state )
+   if ( new_state || rmesa->NewGLState & _NEW_TEXTURE )
    {
       FLUSH_BATCH( rmesa );
 
@@ -1026,8 +1012,9 @@ void r128DDUpdateHWState( GLcontext *ctx )
       if ( new_state & R128_NEW_WINDOW )
 	 r128UpdateWindow( ctx );
 
-      if ( new_state & R128_NEW_TEXTURE )
+      if ( rmesa->NewGLState & _NEW_TEXTURE ) {
 	 r128UpdateTextureState( ctx );
+      }
    }
 }