nvfx: so->RING_3D: stipple

diff --git a/src/gallium/drivers/nvfx/nvfx_context.c b/src/gallium/drivers/nvfx/nvfx_context.c
index eabf9ae7a0733dc90ecc3a70758a45bd0f8ab86d..e7b1486d49691c0e5a801f1aa792b98195631fcb 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.c
+++ b/src/gallium/drivers/nvfx/nvfx_context.c
@@ -85,5 +85,6 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
 
        /* set these to that we init them on first validation */
        nvfx->state.scissor_enabled = ~0;
+       nvfx->state.stipple_enabled = ~0;
        return &nvfx->pipe;
 }

diff --git a/src/gallium/drivers/nvfx/nvfx_state_stipple.c b/src/gallium/drivers/nvfx/nvfx_state_stipple.c
index 57cd3c936a7224cf5ff7fa9a3f3eb1984eaeeae4..828113c4dfe9c381030c4436e87063648bba9791 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_state_stipple.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_stipple.c
@@ -3,31 +3,27 @@
 static boolean
 nvfx_state_stipple_validate(struct nvfx_context *nvfx)
 {
+       struct nouveau_channel *chan = nvfx->screen->base.channel;
        struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
-       struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
-       struct nouveau_stateobj *so;
 
-       if (nvfx->state.hw[NVFX_STATE_STIPPLE] &&
-          (rast->poly_stipple_enable == 0 && nvfx->state.stipple_enabled == 0))
+       if ((rast->poly_stipple_enable == 0 && nvfx->state.stipple_enabled == 0))
                return FALSE;
 
        if (rast->poly_stipple_enable) {
                unsigned i;
 
-               so = so_new(2, 33, 0);
-               so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
-               so_data  (so, 1);
-               so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
+               WAIT_RING(chan, 35);
+               OUT_RING(chan, RING_3D(NV34TCL_POLYGON_STIPPLE_ENABLE, 1));
+               OUT_RING(chan, 1);
+               OUT_RING(chan, RING_3D(NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32));
                for (i = 0; i < 32; i++)
-                       so_data(so, nvfx->stipple[i]);
+                       OUT_RING(chan, nvfx->stipple[i]);
        } else {
-               so = so_new(1, 1, 0);
-               so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
-               so_data  (so, 0);
+               WAIT_RING(chan, 2);
+               OUT_RING(chan, RING_3D(NV34TCL_POLYGON_STIPPLE_ENABLE, 1));
+               OUT_RING(chan, 0);
        }
 
-       so_ref(so, &nvfx->state.hw[NVFX_STATE_STIPPLE]);
-       so_ref(NULL, &so);
        return TRUE;
 }
 
@@ -35,6 +31,5 @@ struct nvfx_state_entry nvfx_state_stipple = {
        .validate = nvfx_state_stipple_validate,
        .dirty = {
                .pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
-               .hw = NVFX_STATE_STIPPLE,
        }
 };