Warn of unknown texture formats.

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 7a23eddfac7db77a10614beb11b3c938e56ec078..1360701871309aa4a7faeddcc55456b45a39a74e 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1200,6 +1200,10 @@ void r300_setup_textures(GLcontext *ctx)
                                t=&default_tex_obj;
                                }
                        //fprintf(stderr, "t->format=%08x\n", t->format);
+                       if((t->format & 0xffffff00)==0xffffff00){
+                               WARN_ONCE("unknown texture format encountered. Help me !\n");
+                               //fprintf(stderr, "t->format=%08x\n", t->format);
+                               }
                        if (RADEON_DEBUG & DEBUG_STATE)
                                fprintf(stderr, "Activating texture unit %d\n", i);
                        max_texture_unit=i;

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 76be5c649aaf547493d9bdf622edda0fac0f83cd..bb79c18ded3fe10c2b53ad2eb7bc7126bb26a360 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -94,23 +94,23 @@ static const struct {
        GLuint format, filter;
 } tx_table[] = {
            {R300_EASY_TX_FORMAT(Y, Z, W, X, W8Z8Y8X8), 0},
-           {1, 0},
-           {2, 0},
-           {3, 0},
-           {4, 0},
-           {5, 0},
-           {6, 0},
-           {7, 0},
-           {8, 0},
-           {9, 0},
-           {10, 0},
-           {11, 0},
-           {12, 0},
-           {13, 0},
-           {14, 0},
-           {15,  0},
-           {16,  0},
-           {17, 0},
+           {0xffffff01, 0},
+           {0xffffff02, 0},
+           {0xffffff03, 0},
+           {0xffffff04, 0},
+           {0xffffff05, 0},
+           {0xffffff06, 0},
+           {0xffffff07, 0},
+           {0xffffff08, 0},
+           {0xffffff09, 0},
+           {0xffffff10, 0},
+           {0xffffff11, 0},
+           {0xffffff12, 0},
+           {0xffffff13, 0},
+           {0xffffff14, 0},
+           {0xffffff15,  0},
+           {0xffffff16,  0},
+           {0xffffff17, 0},
            };