Merge tdfx-3-1-0 branch.

1 files changed, 6 insertions, 9 deletions

diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
index 97931a351..da60bee16 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
@@ -594,16 +594,13 @@ static void uploadTextureImages( tdfxContextPtr fxMesa )
 {
    GLcontext *ctx = fxMesa->glCtx;
    int unit;
-   for (unit = 0; unit < TDFX_NUM_TMU; unit++) {
-      if (ctx->Texture.Unit[unit].ReallyEnabled == TEXTURE0_2D) {
+   for ( unit = 0 ; unit < TDFX_NUM_TMU ; unit++ ) {
+      if ( ctx->Texture.Unit[unit].ReallyEnabled == TEXTURE0_2D ) {
          struct gl_texture_object *tObj = ctx->Texture.Unit[unit].CurrentD[2];
-         tdfxTexInfo *ti = TDFX_TEXTURE_DATA(tObj);
-         if (ti && ti->reloadImages) {
-            /*
-            printf("download texture image on unit %d\n", unit);
-            */
-            tdfxTMDownloadTexture(fxMesa, tObj);
-            ti->reloadImages = GL_FALSE;
+         tdfxTexObjPtr t = TDFX_TEXTURE_DATA(tObj);
+         if ( t && t->reloadImages ) {
+            tdfxTMDownloadTextureLocked( fxMesa, tObj );
+            t->reloadImages = GL_FALSE;
          }
       }
    }