mesa: Branch 'master'

[Brian Paul]

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

New commits:
diff-tree cce5084941f3cd23678d07569a07b6b9cf958868 (from 4b1d1b7b1865191a2687d548edb6c9a066005925)
Author: Brian <brian at yutani.localnet.net>
Date:   Fri Apr 27 15:41:07 2007 -0600

    "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 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);