"Fix" for bug 9170. May need more attention.

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index b941af19966d851674b3a856d8eba8a233786f18..4730fdff7496612c64b48432584ae67367f3b391 100644 (file)
--- 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);