r300: Fix depth texture GL_LUMINANCE vs. GL_INTENSITY mixup

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 2589ec572ec95d6490985929b29ec11816e7397f..bdd20b18e442622bd70a4fcc5346ce41047d1afa 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -127,18 +127,18 @@ void r300SetDepthTexMode(struct gl_texture_object *tObj)
 {
        static const GLuint formats[3][3] = {
                {
-                       R300_EASY_TX_FORMAT(X, X, X, X, X16),
                        R300_EASY_TX_FORMAT(X, X, X, ONE, X16),
+                       R300_EASY_TX_FORMAT(X, X, X, X, X16),
                        R300_EASY_TX_FORMAT(ZERO, ZERO, ZERO, X, X16),
                },
                {
-                       R300_EASY_TX_FORMAT(X, X, X, X, X24_Y8),
                        R300_EASY_TX_FORMAT(X, X, X, ONE, X24_Y8),
+                       R300_EASY_TX_FORMAT(X, X, X, X, X24_Y8),
                        R300_EASY_TX_FORMAT(ZERO, ZERO, ZERO, X, X24_Y8),
                },
                {
-                       R300_EASY_TX_FORMAT(X, X, X, X, X32),
                        R300_EASY_TX_FORMAT(X, X, X, ONE, X32),
+                       R300_EASY_TX_FORMAT(X, X, X, X, X32),
                        R300_EASY_TX_FORMAT(ZERO, ZERO, ZERO, X, X32),
                },
        };