dri/nv20: Fix some PGRAPH_ERRORs seen with DATA_CHECK enabled.

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
index 21da4f7af1643dd77f4dbaf5fe72f359b1538373..95691cad0478693c436804d65144d7c7141d3422 100644 (file)
--- 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);

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
index e46118e4fce53a9742c7fd97a29d88f1db7c376a..2d45513bb4c34740200f10a918df70f0e7ab1cc2 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
@@ -194,7 +194,8 @@ nv20_emit_tex_obj(GLcontext *ctx, int emit)
                | nvgl_wrap_mode(t->WrapS) << 0;
 
        tx_filter = nvgl_filter_mode(t->MagFilter) << 24
-               | nvgl_filter_mode(t->MinFilter) << 16;
+               | nvgl_filter_mode(t->MinFilter) << 16
+               | 2 << 12;
 
        tx_enable = NV20TCL_TX_ENABLE_ENABLE
                | log2i(t->MaxAnisotropy) << 4;