r600: don't enable depth test if there is no depth buffer

[mesa.git] / src / gallium / drivers / nv40 / nv40_state_viewport.c

diff --git a/src/gallium/drivers/nv40/nv40_state_viewport.c b/src/gallium/drivers/nv40/nv40_state_viewport.c
index 869a55b40536d9d59718f9f970ba6a08e1e75657..3aacb00f996b3fbc46fdcd9a0d3cb3cccfd28296 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_viewport.c
+++ b/src/gallium/drivers/nv40/nv40_state_viewport.c
@@ -5,56 +5,27 @@ nv40_state_viewport_validate(struct nv40_context *nv40)
 {
        struct pipe_viewport_state *vpt = &nv40->viewport;
        struct nouveau_stateobj *so;
-       unsigned bypass;
-
-       if (nv40->render_mode == HW && !nv40->rasterizer->pipe.bypass_clipping)
-               bypass = 0;
-       else
-               bypass = 1;
 
        if (nv40->state.hw[NV40_STATE_VIEWPORT] &&
-           (bypass || !(nv40->dirty & NV40_NEW_VIEWPORT)) &&
-           nv40->state.viewport_bypass == bypass)
+           !(nv40->dirty & NV40_NEW_VIEWPORT))
                return FALSE;
-       nv40->state.viewport_bypass = bypass;
 
-       so = so_new(11, 0);
-       if (!bypass) {
-               so_method(so, nv40->screen->curie,
-                         NV40TCL_VIEWPORT_TRANSLATE_X, 8);
-               so_data  (so, fui(vpt->translate[0]));
-               so_data  (so, fui(vpt->translate[1]));
-               so_data  (so, fui(vpt->translate[2]));
-               so_data  (so, fui(vpt->translate[3]));
-               so_data  (so, fui(vpt->scale[0]));
-               so_data  (so, fui(vpt->scale[1]));
-               so_data  (so, fui(vpt->scale[2]));
-               so_data  (so, fui(vpt->scale[3]));
-               so_method(so, nv40->screen->curie, 0x1d78, 1);
-               so_data  (so, 1);
-       } else {
-               so_method(so, nv40->screen->curie,
-                         NV40TCL_VIEWPORT_TRANSLATE_X, 8);
-               so_data  (so, fui(0.0));
-               so_data  (so, fui(0.0));
-               so_data  (so, fui(0.0));
-               so_data  (so, fui(0.0));
-               so_data  (so, fui(1.0));
-               so_data  (so, fui(1.0));
-               so_data  (so, fui(1.0));
-               so_data  (so, fui(0.0));
-               /* Not entirely certain what this is yet.  The DDX uses this
-                * value also as it fixes rendering when you pass
-                * pre-transformed vertices to the GPU.  My best gusss is that
-                * this bypasses some culling/clipping stage.  Might be worth
-                * noting that points/lines are uneffected by whatever this
-                * value fixes, only filled polygons are effected.
-                */
-               so_method(so, nv40->screen->curie, 0x1d78, 1);
-               so_data  (so, 0x110);
-       }
+       so = so_new(2, 9, 0);
+       so_method(so, nv40->screen->curie,
+                 NV40TCL_VIEWPORT_TRANSLATE_X, 8);
+       so_data  (so, fui(vpt->translate[0]));
+       so_data  (so, fui(vpt->translate[1]));
+       so_data  (so, fui(vpt->translate[2]));
+       so_data  (so, fui(vpt->translate[3]));
+       so_data  (so, fui(vpt->scale[0]));
+       so_data  (so, fui(vpt->scale[1]));
+       so_data  (so, fui(vpt->scale[2]));
+       so_data  (so, fui(vpt->scale[3]));
+       so_method(so, nv40->screen->curie, 0x1d78, 1);
+       so_data  (so, 1);
 
        so_ref(so, &nv40->state.hw[NV40_STATE_VIEWPORT]);
+       so_ref(NULL, &so);
        return TRUE;
 }