projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7766726
)
r300UpdateTextureEnv shouldnt be called.
author
Aapo Tahkola
<aet@rasterburn.org>
Fri, 27 Jan 2006 12:18:58 +0000
(12:18 +0000)
committer
Aapo Tahkola
<aet@rasterburn.org>
Fri, 27 Jan 2006 12:18:58 +0000
(12:18 +0000)
src/mesa/drivers/dri/r300/r300_texstate.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/r300/r300_texstate.c
b/src/mesa/drivers/dri/r300/r300_texstate.c
index 7a3d9197c9da3f92d52d3bb8a6bf516a14135d24..ca42afdc1fd886ace1e6722f0f1572b9a84d1061 100644
(file)
--- a/
src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/
src/mesa/drivers/dri/r300/r300_texstate.c
@@
-1124,7
+1124,7
@@
static GLboolean update_tex_common(GLcontext * ctx, int unit)
rmesa->NewGLState |= _NEW_TEXTURE_MATRIX;
}
#endif
-
+#if 0
format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
if (rmesa->state.texture.unit[unit].format != format ||
rmesa->state.texture.unit[unit].envMode != texUnit->EnvMode) {
@@
-1134,7
+1134,7
@@
static GLboolean update_tex_common(GLcontext * ctx, int unit)
return GL_FALSE;
}
}
-
+#endif
#if R200_MERGED
FALLBACK(&rmesa->radeon, RADEON_FALLBACK_BORDER_MODE, t->border_fallback);
#endif