From 5737fda093f8e1f4daabda3d55762dc7c4fe8ed9 Mon Sep 17 00:00:00 2001 From: Vladimir Dergachev Date: Wed, 9 Mar 2005 05:31:31 +0000 Subject: [PATCH] Don't use R200 texture constants - R300 fields are all different. --- src/mesa/drivers/dri/r300/r300_texstate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index cb615fa..3d9126e 100644 --- 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); -- 2.7.4