summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-04-27 15:41:07 -0600
committerBrian <brian@yutani.localnet.net>2007-04-27 15:41:07 -0600
commitcce5084941f3cd23678d07569a07b6b9cf958868 (patch)
treebf7a5b406b5ad644379a46e819cb21f33961ff5c /src/mesa
parent4b1d1b7b1865191a2687d548edb6c9a066005925 (diff)
downloadexternal_mesa3d-cce5084941f3cd23678d07569a07b6b9cf958868.zip
external_mesa3d-cce5084941f3cd23678d07569a07b6b9cf958868.tar.gz
external_mesa3d-cce5084941f3cd23678d07569a07b6b9cf958868.tar.bz2
"Fix" for bug 9170. May need more attention.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index b941af1..4730fdf 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1269,6 +1269,9 @@ void r300_setup_textures(GLcontext *ctx)
tmu_mappings[i] = hw_tmu;
t=r300->state.texture.unit[i].texobj;
+ /* XXX questionable fix for bug 9170: */
+ if (!t)
+ continue;
if((t->format & 0xffffff00)==0xffffff00) {
WARN_ONCE("unknown texture format (entry %x) encountered. Help me !\n", t->format & 0xff);