diff options
| author | Aapo Tahkola <[email protected]> | 2005-02-08 07:05:25 +0000 |
|---|---|---|
| committer | Aapo Tahkola <[email protected]> | 2005-02-08 07:05:25 +0000 |
| commit | 46cde1715f29dddf5d0a41d8c91ee117208d9685 (patch) | |
| tree | 6870894e031d2eb1919bc9462d856a5651af0199 /src/mesa/drivers/dri/r300/r300_ioctl.c | |
| parent | d084982240bafba0169c4a6cacf02d45d6cfd8c1 (diff) | |
BIG FAT NOTE: Theres a nasty bug somewhere thats causing vb color buffer clears and other things not to work. This bug can be triggered by extending struct r300_hw_state by two struct r300_state_atom's from its current size. Everything zbs and unk42B4 related is now covered with HAVE_ZBS and GA ifdefs. Who wants to fix it? Not i. :)
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_ioctl.c | 10 |
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 e7e1d37b681..84b475d064c 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -281,7 +281,7 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask, GLboolean all, if (dPriv->numClipRects == 0) return; } - +#ifdef HAVE_ZBS /* When unk42B4==0 z-bias is still on for vb mode with points ... */ R300_STATECHANGE(r300, zbs); zbs[0]=r300->hw.zbs.cmd[R300_ZBS_T_FACTOR]; @@ -297,8 +297,8 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask, GLboolean all, /* Make sure z-bias isnt on */ R300_STATECHANGE(r300, unk42B4); unk42B4=r300->hw.unk42B4.cmd[1]; - r300->hw.unk42B4.cmd[1]=3; - + r300->hw.unk42B4.cmd[1]=0;//3; +#endif if (mask & DD_FRONT_LEFT_BIT) { flags |= DD_FRONT_LEFT_BIT; mask &= ~DD_FRONT_LEFT_BIT; @@ -340,7 +340,7 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask, GLboolean all, * but do keep it like this for now. */ r300ResetHwState(r300); - +#ifdef HAVE_ZBS R300_STATECHANGE(r300, unk42B4); r300->hw.unk42B4.cmd[1]=unk42B4; @@ -350,7 +350,7 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask, GLboolean all, r300->hw.zbs.cmd[R300_ZBS_T_CONSTANT] = zbs[1]; r300->hw.zbs.cmd[R300_ZBS_W_FACTOR] = zbs[2]; r300->hw.zbs.cmd[R300_ZBS_W_CONSTANT] = zbs[3]; - +#endif /* r300ClearBuffer has trampled all over the hardware state.. */ r300->hw.all_dirty=GL_TRUE; } |