diff options
| author | reist <reist> | 2005-02-16 10:38:57 +0000 |
|---|---|---|
| committer | reist <reist> | 2005-02-16 10:38:57 +0000 |
| commit | 5c2f3d5d3aea45363d49bab0079ffe0219eaaaed (patch) | |
| tree | 4d93b549336682df95db49f57d98af94bd71d659 /src/mesa | |
| parent | d588311dbb5eff92bb71ba88bcf5342328a428ce (diff) | |
get two textures to work
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 862fabbc14..f7e3f7ae13 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 0946680671..4616db2c44 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}, |