From 5c2f3d5d3aea45363d49bab0079ffe0219eaaaed Mon Sep 17 00:00:00 2001
From: reist <reist>
Date: Wed, 16 Feb 2005 10:38:57 +0000
Subject: get two textures to work

---
 src/mesa/drivers/dri/r300/r300_render.c   | 2 +-
 src/mesa/drivers/dri/r300/r300_texstate.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 862fabbc142..f7e3f7ae13c 100644
--- 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 09466806713..4616db2c44d 100644
--- 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},
-- 
cgit v1.2.3