diff options
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_state_blend.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_state_blend.c | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_state_blend.c b/src/gallium/drivers/nvfx/nvfx_state_blend.c index 03b6ef8117..fe34e98364 100644 --- a/src/gallium/drivers/nvfx/nvfx_state_blend.c +++ b/src/gallium/drivers/nvfx/nvfx_state_blend.c @@ -1,41 +1,22 @@ #include "nvfx_context.h" -static boolean +void nvfx_state_blend_validate(struct nvfx_context *nvfx) { - so_ref(nvfx->blend->so, &nvfx->state.hw[NVFX_STATE_BLEND]); - return TRUE; + struct nouveau_channel* chan = nvfx->screen->base.channel; + sb_emit(chan, nvfx->blend->sb, nvfx->blend->sb_len); } -struct nvfx_state_entry nvfx_state_blend = { - .validate = nvfx_state_blend_validate, - .dirty = { - .pipe = NVFX_NEW_BLEND, - .hw = NVFX_STATE_BLEND - } -}; - -static boolean +void nvfx_state_blend_colour_validate(struct nvfx_context *nvfx) { - struct nouveau_stateobj *so = so_new(1, 1, 0); + struct nouveau_channel* chan = nvfx->screen->base.channel; struct pipe_blend_color *bcol = &nvfx->blend_colour; - so_method(so, nvfx->screen->eng3d, NV34TCL_BLEND_COLOR, 1); - so_data (so, ((float_to_ubyte(bcol->color[3]) << 24) | + WAIT_RING(chan, 2); + OUT_RING(chan, RING_3D(NV34TCL_BLEND_COLOR, 1)); + OUT_RING(chan, ((float_to_ubyte(bcol->color[3]) << 24) | (float_to_ubyte(bcol->color[0]) << 16) | (float_to_ubyte(bcol->color[1]) << 8) | (float_to_ubyte(bcol->color[2]) << 0))); - - so_ref(so, &nvfx->state.hw[NVFX_STATE_BCOL]); - so_ref(NULL, &so); - return TRUE; } - -struct nvfx_state_entry nvfx_state_blend_colour = { - .validate = nvfx_state_blend_colour_validate, - .dirty = { - .pipe = NVFX_NEW_BCOL, - .hw = NVFX_STATE_BCOL - } -}; |