get two textures to work

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 862fabbc142ff12b4541c7608667a35c70624823..f7e3f7ae13c44dd5963cd0b306001fab610a92e7 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -605,7 +605,7 @@ static GLboolean r300_run_render(GLcontext *ctx,
        
    #if 1
        
-       #if 0
+       #if 1
         return r300_run_immediate_render(ctx, stage);
        #else 
         return r300_run_vb_render(ctx, stage);

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 09466806713cc1750855114d7f2b64fff9f55a0d..4616db2c44d9505c9f3cf4799cf88e7d6e6ae88a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -126,9 +126,9 @@ static const struct {
            {0xffffff03, 0},
            {0xffffff04, 0},
            {0xffffff05, 0},
-           {0xffffff06, 0},
+           {R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5), 0},
            {0xffffff07, 0},
-           {0xffffff08, 0},
+           {R300_EASY_TX_FORMAT(Y, Z, W, X, W4Z4Y4X4), 0},
            {0xffffff09, 0},
            {0xffffff10, 0},
            {0xffffff11, 0},