diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-20 20:37:17 +0100 |
|---|---|---|
| committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:01 -0400 |
| commit | 0b55e1cd17801a03d6fbb7ce46f25aa2b086bff4 (patch) | |
| tree | aab308e6cf589d8372a771c3395ba420b551ef74 /src/gallium/drivers/nv30 | |
| parent | 778c64da97272e7508dbcdf0bffdb699d1b04ce0 (diff) | |
nv30, nv40: unify identical nv[34]0_state_blend.c
Diffstat (limited to 'src/gallium/drivers/nv30')
| -rw-r--r-- | src/gallium/drivers/nv30/Makefile | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_state_blend.c | 41 |
3 files changed, 0 insertions, 44 deletions
diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile index 3067e45062..66dad8f358 100644 --- a/src/gallium/drivers/nv30/Makefile +++ b/src/gallium/drivers/nv30/Makefile @@ -12,7 +12,6 @@ C_SOURCES = \ nv30_query.c \ nv30_screen.c \ nv30_state.c \ - nv30_state_blend.c \ nv30_state_fb.c \ nv30_state_rasterizer.c \ nv30_state_scissor.c \ diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h index a6767da4dc..e6194b23f5 100644 --- a/src/gallium/drivers/nv30/nv30_context.h +++ b/src/gallium/drivers/nv30/nv30_context.h @@ -29,8 +29,6 @@ extern struct nvfx_state_entry nv30_state_scissor; extern struct nvfx_state_entry nv30_state_stipple; extern struct nvfx_state_entry nv30_state_fragprog; extern struct nvfx_state_entry nv30_state_vertprog; -extern struct nvfx_state_entry nv30_state_blend; -extern struct nvfx_state_entry nv30_state_blend_colour; extern struct nvfx_state_entry nv30_state_zsa; extern struct nvfx_state_entry nv30_state_viewport; extern struct nvfx_state_entry nv30_state_framebuffer; diff --git a/src/gallium/drivers/nv30/nv30_state_blend.c b/src/gallium/drivers/nv30/nv30_state_blend.c deleted file mode 100644 index de368e5bd7..0000000000 --- a/src/gallium/drivers/nv30/nv30_state_blend.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "nv30_context.h" - -static boolean -nv30_state_blend_validate(struct nvfx_context *nvfx) -{ - so_ref(nvfx->blend->so, &nvfx->state.hw[NVFX_STATE_BLEND]); - return TRUE; -} - -struct nvfx_state_entry nv30_state_blend = { - .validate = nv30_state_blend_validate, - .dirty = { - .pipe = NVFX_NEW_BLEND, - .hw = NVFX_STATE_BLEND - } -}; - -static boolean -nv30_state_blend_colour_validate(struct nvfx_context *nvfx) -{ - struct nouveau_stateobj *so = so_new(1, 1, 0); - 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) | - (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 nv30_state_blend_colour = { - .validate = nv30_state_blend_colour_validate, - .dirty = { - .pipe = NVFX_NEW_BCOL, - .hw = NVFX_STATE_BCOL - } -}; |