nvfx: so->RING_3D: sr

diff --git a/src/gallium/drivers/nvfx/nvfx_state_zsa.c b/src/gallium/drivers/nvfx/nvfx_state_zsa.c
index 689a9fd6785e76be0a4f73e172baeb8ba184b908..ba2261c422848c96af463684f240e612e4eab504 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_state_zsa.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_zsa.c
@@ -18,16 +18,14 @@ struct nvfx_state_entry nvfx_state_zsa = {
 static boolean
 nvfx_state_sr_validate(struct nvfx_context *nvfx)
 {
-       struct nouveau_stateobj *so = so_new(2, 2, 0);
+       struct nouveau_channel* chan = nvfx->screen->base.channel;
        struct pipe_stencil_ref *sr = &nvfx->stencil_ref;
 
-       so_method(so, nvfx->screen->eng3d, NV34TCL_STENCIL_FRONT_FUNC_REF, 1);
-       so_data  (so, sr->ref_value[0]);
-       so_method(so, nvfx->screen->eng3d, NV34TCL_STENCIL_BACK_FUNC_REF, 1);
-       so_data  (so, sr->ref_value[1]);
-
-       so_ref(so, &nvfx->state.hw[NVFX_STATE_SR]);
-       so_ref(NULL, &so);
+       WAIT_RING(chan, 4);
+       OUT_RING(chan, RING_3D(NV34TCL_STENCIL_FRONT_FUNC_REF, 1));
+       OUT_RING(chan, sr->ref_value[0]);
+       OUT_RING(chan, RING_3D(NV34TCL_STENCIL_BACK_FUNC_REF, 1));
+       OUT_RING(chan, sr->ref_value[1]);
        return TRUE;
 }
 
@@ -35,6 +33,5 @@ struct nvfx_state_entry nvfx_state_sr = {
        .validate = nvfx_state_sr_validate,
        .dirty = {
                .pipe = NVFX_NEW_SR,
-               .hw = NVFX_STATE_SR
        }
 };