diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-20 23:16:01 +0100 |
|---|---|---|
| committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:01 -0400 |
| commit | ada801222b3c984c260165415864a8f511145251 (patch) | |
| tree | f51e6e4e75c9fe387e1d6a777e7d74aa0f5df1a7 /src/gallium/drivers/nv30 | |
| parent | 0b55e1cd17801a03d6fbb7ce46f25aa2b086bff4 (diff) | |
nv30, nv40: unify identical nv[34]0_state_rasterizer.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 | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_state_rasterizer.c | 17 |
3 files changed, 0 insertions, 19 deletions
diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile index 66dad8f358..668f5965b1 100644 --- a/src/gallium/drivers/nv30/Makefile +++ b/src/gallium/drivers/nv30/Makefile @@ -13,7 +13,6 @@ C_SOURCES = \ nv30_screen.c \ nv30_state.c \ nv30_state_fb.c \ - nv30_state_rasterizer.c \ nv30_state_scissor.c \ nv30_state_stipple.c \ nv30_state_viewport.c \ diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h index e6194b23f5..fbafbec383 100644 --- a/src/gallium/drivers/nv30/nv30_context.h +++ b/src/gallium/drivers/nv30/nv30_context.h @@ -24,7 +24,6 @@ extern void nv30_fragprog_destroy(struct nvfx_context *, extern void nv30_fragtex_bind(struct nvfx_context *); /* nv30_state.c and friends */ -extern struct nvfx_state_entry nv30_state_rasterizer; extern struct nvfx_state_entry nv30_state_scissor; extern struct nvfx_state_entry nv30_state_stipple; extern struct nvfx_state_entry nv30_state_fragprog; diff --git a/src/gallium/drivers/nv30/nv30_state_rasterizer.c b/src/gallium/drivers/nv30/nv30_state_rasterizer.c deleted file mode 100644 index 1a83da5204..0000000000 --- a/src/gallium/drivers/nv30/nv30_state_rasterizer.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "nv30_context.h" - -static boolean -nv30_state_rasterizer_validate(struct nvfx_context *nvfx) -{ - so_ref(nvfx->rasterizer->so, - &nvfx->state.hw[NVFX_STATE_RAST]); - return TRUE; -} - -struct nvfx_state_entry nv30_state_rasterizer = { - .validate = nv30_state_rasterizer_validate, - .dirty = { - .pipe = NVFX_NEW_RAST, - .hw = NVFX_STATE_RAST - } -}; |