From cce5084941f3cd23678d07569a07b6b9cf958868 Mon Sep 17 00:00:00 2001
From: Brian <brian@yutani.localnet.net>
Date: Fri, 27 Apr 2007 15:41:07 -0600
Subject: "Fix" for bug 9170.  May need more attention.

---
 src/mesa/drivers/dri/r300/r300_state.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/drivers/dri/r300/r300_state.c')

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index b941af1996..4730fdff74 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);
-- 
cgit v1.2.3