From f768528af53f3f7d7a1a90b3eef1b02bd821e28a Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Tue, 23 Feb 2010 15:45:07 +0100 Subject: [PATCH] nvfx: so->RING_3D: sr --- src/gallium/drivers/nvfx/nvfx_state_zsa.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/nvfx/nvfx_state_zsa.c b/src/gallium/drivers/nvfx/nvfx_state_zsa.c index 689a9fd6785..ba2261c4228 100644 --- 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 } }; -- 2.30.2