minor updates for 3.5

diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index dc2db8e3198c273d3e88266a8f45d23338dfb11a..ae98976b1bf6249a57d7304eeaed3acbafc53733 100644 (file)
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -1050,10 +1050,6 @@ fxSetupTexture_NoLock(GLcontext * ctx)
       fprintf(stderr, "fxmesa: fxSetupTexture(...)\n");
    }
 
-   /* Disable multipass texturing.
-    */
-   ctx->Driver.MultipassFunc = 0;
-
    /* Texture Combine, Color Combine and Alpha Combine.
     */
    tex2Denabled = (ctx->Texture._ReallyEnabled & TEXTURE0_2D);
@@ -1076,7 +1072,7 @@ fxSetupTexture_NoLock(GLcontext * ctx)
            fprintf(stderr, "fxmesa: enabling fake multitexture\n");
 
         fxSetupTextureSingleTMU_NoLock(ctx, 0);
-        ctx->Driver.MultipassFunc = fxMultipassTexture;
+        /*ctx->Driver.MultipassFunc = fxMultipassTexture;*/
       }
       break;
    default: