summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-07-28 22:32:49 +0200
committerFrancisco Jerez <currojerez@riseup.net>2010-08-05 01:48:14 +0200
commitd03f04bfb57cb7b5537cb31f1dc798a6ba500f36 (patch)
tree340b18f5f3cc3f807b343dade30f754ab1001fdc /src/mesa/drivers/dri/nouveau/nv20_state_fb.c
parente96a52e9933eea7264a42983db1428368bcb4962 (diff)
dri/nv20: Fix some PGRAPH_ERRORs seen with DATA_CHECK enabled.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv20_state_fb.c')
-rw-r--r--src/mesa/drivers/dri/nouveau/nv20_state_fb.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
index 21da4f7af1..95691cad04 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
@@ -72,7 +72,7 @@ nv20_emit_framebuffer(GLcontext *ctx, int emit)
fb->_ColorDrawBuffers[0])->surface;
rt_format |= get_rt_format(s->format);
- zeta_pitch = rt_pitch = s->pitch;
+ rt_pitch = s->pitch;
nouveau_bo_markl(bctx, kelvin, NV20TCL_COLOR_OFFSET,
s->bo, 0, bo_flags);
@@ -88,6 +88,9 @@ nv20_emit_framebuffer(GLcontext *ctx, int emit)
nouveau_bo_markl(bctx, kelvin, NV20TCL_ZETA_OFFSET,
s->bo, 0, bo_flags);
+ } else {
+ rt_format |= get_rt_format(MESA_FORMAT_Z24_S8);
+ zeta_pitch = rt_pitch;
}
BEGIN_RING(chan, kelvin, NV20TCL_RT_FORMAT, 2);