From: Brian <brian@yutani.localnet.net>
Date: Fri, 27 Apr 2007 21:41:07 +0000 (-0600)
Subject: "Fix" for bug 9170.  May need more attention.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cce5084941f3cd23678d07569a07b6b9cf958868;p=mesa.git

"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 b941af19966..4730fdff749 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);