summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv40
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/drivers/nv40')
-rw-r--r--src/gallium/drivers/nv40/Makefile1
-rw-r--r--src/gallium/drivers/nv40/nv40_context.h2
-rw-r--r--src/gallium/drivers/nv40/nv40_state_blend.c41
3 files changed, 0 insertions, 44 deletions
diff --git a/src/gallium/drivers/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
index b0c0c09d51..739ca43387 100644
--- a/src/gallium/drivers/nv40/Makefile
+++ b/src/gallium/drivers/nv40/Makefile
@@ -12,7 +12,6 @@ C_SOURCES = \
nv40_query.c \
nv40_screen.c \
nv40_state.c \
- nv40_state_blend.c \
nv40_state_fb.c \
nv40_state_rasterizer.c \
nv40_state_scissor.c \
diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index 0b875bcb06..28a79e4ecf 100644
--- a/src/gallium/drivers/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -33,8 +33,6 @@ extern struct nvfx_state_entry nv40_state_scissor;
extern struct nvfx_state_entry nv40_state_stipple;
extern struct nvfx_state_entry nv40_state_fragprog;
extern struct nvfx_state_entry nv40_state_vertprog;
-extern struct nvfx_state_entry nv40_state_blend;
-extern struct nvfx_state_entry nv40_state_blend_colour;
extern struct nvfx_state_entry nv40_state_zsa;
extern struct nvfx_state_entry nv40_state_viewport;
extern struct nvfx_state_entry nv40_state_framebuffer;
diff --git a/src/gallium/drivers/nv40/nv40_state_blend.c b/src/gallium/drivers/nv40/nv40_state_blend.c
deleted file mode 100644
index bb06b4888d..0000000000
--- a/src/gallium/drivers/nv40/nv40_state_blend.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "nv40_context.h"
-
-static boolean
-nv40_state_blend_validate(struct nvfx_context *nvfx)
-{
- so_ref(nvfx->blend->so, &nvfx->state.hw[NVFX_STATE_BLEND]);
- return TRUE;
-}
-
-struct nvfx_state_entry nv40_state_blend = {
- .validate = nv40_state_blend_validate,
- .dirty = {
- .pipe = NVFX_NEW_BLEND,
- .hw = NVFX_STATE_BLEND
- }
-};
-
-static boolean
-nv40_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 nv40_state_blend_colour = {
- .validate = nv40_state_blend_colour_validate,
- .dirty = {
- .pipe = NVFX_NEW_BCOL,
- .hw = NVFX_STATE_BCOL
- }
-};