summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r300_ioctl.c
diff options
context:
space:
mode:
authorVladimir Dergachev <volodya@freedesktop.org>2005-01-15 19:33:19 +0000
committerVladimir Dergachev <volodya@freedesktop.org>2005-01-15 19:33:19 +0000
commit76de160b642aa7eac41db05883a9c6b414d17cb5 (patch)
tree2848e3f49983528268af4a1483430faa8539257f /src/mesa/drivers/dri/r300/r300_ioctl.c
parentb5f49e6f91664a82f2356d667eaa8504ba56b7c0 (diff)
On the way to getting stencil and texture formats working.
Looks like the matter of texture formats is a lot simpler, with the wrong display in quake explained by the fact that we are not handling texture combine modes.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_ioctl.c')
-rw-r--r--src/mesa/drivers/dri/r300/r300_ioctl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 80d059da70..16528e0100 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -200,10 +200,10 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags, int buffer)
r300->hw.vpi.cmd[7] = VP_ZERO();
r300->hw.vpi.cmd[8] = 0;
- R300_STATECHANGE(r300, zc);
+ R300_STATECHANGE(r300, zs);
if (flags & CLEARBUFFER_DEPTH) {
- r300->hw.zc.cmd[R300_ZC_CNTL_0] = 0x6; // test and write
- r300->hw.zc.cmd[R300_ZC_CNTL_1] = R300_Z_TEST_ALWAYS;
+ r300->hw.zs.cmd[R300_ZS_CNTL_0] = 0x6; // test and write
+ r300->hw.zs.cmd[R300_ZS_CNTL_1] = (R300_ZS_ALWAYS<<R300_RB3D_ZS1_DEPTH_FUNC_SHIFT);
/*
R300_STATECHANGE(r300, zb);
r300->hw.zb.cmd[R300_ZB_OFFSET] =
@@ -214,8 +214,8 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags, int buffer)
r300->radeon.radeonScreen->depthPitch;
*/
} else {
- r300->hw.zc.cmd[R300_ZC_CNTL_0] = 0; // disable
- r300->hw.zc.cmd[R300_ZC_CNTL_1] = 0;
+ r300->hw.zs.cmd[R300_ZS_CNTL_0] = 0; // disable
+ r300->hw.zs.cmd[R300_ZS_CNTL_1] = 0;
}
/* Make sure we have enough space */