Don't use R200 texture constants - R300 fields are all different.

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index cb615faf733183790173330b096541b9899ab24d..3d9126e5c4fd17675d4d092ae8e5548fbc5f982a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -1095,10 +1095,12 @@ static GLboolean enable_tex_2d(GLcontext * ctx, int unit)
 
        /* Need to load the 2d images associated with this unit.
         */
+       #if 0
        if (t->format & R200_TXFORMAT_NON_POWER2) {
                t->format &= ~R200_TXFORMAT_NON_POWER2;
                t->base.dirty_images[0] = ~0;
        }
+       #endif
 
        ASSERT(tObj->Target == GL_TEXTURE_2D || tObj->Target == GL_TEXTURE_1D);
 
@@ -1199,10 +1201,12 @@ static GLboolean enable_tex_rect(GLcontext * ctx, int unit)
        struct gl_texture_object *tObj = texUnit->_Current;
        r300TexObjPtr t = (r300TexObjPtr) tObj->DriverData;
 
+       #if 0
        if (!(t->format & R200_TXFORMAT_NON_POWER2)) {
                t->format |= R200_TXFORMAT_NON_POWER2;
                t->base.dirty_images[0] = ~0;
        }
+       #endif
 
        ASSERT(tObj->Target == GL_TEXTURE_RECTANGLE_NV);