diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2005-02-08 19:26:59 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2005-02-08 19:26:59 +0000 |
| commit | 6a04cff065c9a28495fe515fb5d9cd159d53de71 (patch) | |
| tree | d725a9a439f257577d6fec990992a18631a7f000 /src/mesa/drivers/dri/r300/r300_ioctl.c | |
| parent | 3dec3c7a74035bc85eab31a3c442e362d41ffe6d (diff) | |
Fix the bug and get zbias back into shape. There might still be some problems with initial zbias...
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_ioctl.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index 84b475d064..6ba5bf257a 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -281,7 +281,8 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask, GLboolean all, if (dPriv->numClipRects == 0) return; } -#ifdef HAVE_ZBS + +#if 0 /* We shouldnt need this now */ /* 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]; @@ -293,12 +294,12 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask, GLboolean all, r300->hw.zbs.cmd[R300_ZBS_T_CONSTANT] = r300->hw.zbs.cmd[R300_ZBS_W_FACTOR] = r300->hw.zbs.cmd[R300_ZBS_W_CONSTANT] = r300PackFloat32(0.0); - +#endif /* Make sure z-bias isnt on */ R300_STATECHANGE(r300, unk42B4); unk42B4=r300->hw.unk42B4.cmd[1]; - r300->hw.unk42B4.cmd[1]=0;//3; -#endif + r300->hw.unk42B4.cmd[1]=0; + if (mask & DD_FRONT_LEFT_BIT) { flags |= DD_FRONT_LEFT_BIT; mask &= ~DD_FRONT_LEFT_BIT; @@ -340,10 +341,11 @@ 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; +#if 0 /* We shouldnt need this now */ /* Put real z-bias back */ R300_STATECHANGE(r300, zbs); r300->hw.zbs.cmd[R300_ZBS_T_FACTOR] = zbs[0]; @@ -407,7 +409,7 @@ void r300RefillCurrentDmaRegion(r300ContextPtr rmesa) break; if (rmesa->dma.nr_released_bufs) { - r200FlushCmdBufLocked(rmesa, __FUNCTION__); + r300FlushCmdBufLocked(rmesa, __FUNCTION__); } if (rmesa->radeon.do_usleeps) { |