From 64d882637dc97b332eb3c0f457376f86b75c8c5f Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Sat, 20 Feb 2010 23:19:40 +0100 Subject: [PATCH] nv30, nv40: unify identical nv[34]0_state_zsa.c --- src/gallium/drivers/nv30/Makefile | 1 - src/gallium/drivers/nv30/nv30_context.h | 2 - src/gallium/drivers/nv40/Makefile | 1 - src/gallium/drivers/nv40/nv40_context.h | 2 - src/gallium/drivers/nv40/nv40_state_zsa.c | 41 ------------------- src/gallium/drivers/nvfx/Makefile | 1 + src/gallium/drivers/nvfx/nvfx_context.h | 2 + src/gallium/drivers/nvfx/nvfx_state_emit.c | 4 +- .../nvfx_state_zsa.c} | 14 +++---- 9 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 src/gallium/drivers/nv40/nv40_state_zsa.c rename src/gallium/drivers/{nv30/nv30_state_zsa.c => nvfx/nvfx_state_zsa.c} (69%) diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile index bbfca55e495..8f198ff2b70 100644 --- a/src/gallium/drivers/nv30/Makefile +++ b/src/gallium/drivers/nv30/Makefile @@ -15,7 +15,6 @@ C_SOURCES = \ nv30_state_fb.c \ nv30_state_stipple.c \ nv30_state_viewport.c \ - nv30_state_zsa.c \ nv30_surface.c \ nv30_vbo.c \ nv30_vertprog.c diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h index 5a5311e5a9c..2ee12ef5d8f 100644 --- a/src/gallium/drivers/nv30/nv30_context.h +++ b/src/gallium/drivers/nv30/nv30_context.h @@ -27,12 +27,10 @@ extern void nv30_fragtex_bind(struct nvfx_context *); 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_zsa; extern struct nvfx_state_entry nv30_state_viewport; extern struct nvfx_state_entry nv30_state_framebuffer; extern struct nvfx_state_entry nv30_state_fragtex; extern struct nvfx_state_entry nv30_state_vbo; -extern struct nvfx_state_entry nv30_state_sr; /* nv30_vbo.c */ extern void nv30_draw_arrays(struct pipe_context *, unsigned mode, diff --git a/src/gallium/drivers/nv40/Makefile b/src/gallium/drivers/nv40/Makefile index 02bbb15f81d..1cad9409ed4 100644 --- a/src/gallium/drivers/nv40/Makefile +++ b/src/gallium/drivers/nv40/Makefile @@ -15,7 +15,6 @@ C_SOURCES = \ nv40_state_fb.c \ nv40_state_stipple.c \ nv40_state_viewport.c \ - nv40_state_zsa.c \ nv40_surface.c \ nv40_vbo.c \ nv40_vertprog.c diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h index d3464ad7a3b..3dcbbae30b3 100644 --- a/src/gallium/drivers/nv40/nv40_context.h +++ b/src/gallium/drivers/nv40/nv40_context.h @@ -31,13 +31,11 @@ extern void nv40_fragtex_bind(struct nvfx_context *); 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_zsa; extern struct nvfx_state_entry nv40_state_viewport; extern struct nvfx_state_entry nv40_state_framebuffer; extern struct nvfx_state_entry nv40_state_fragtex; extern struct nvfx_state_entry nv40_state_vbo; extern struct nvfx_state_entry nv40_state_vtxfmt; -extern struct nvfx_state_entry nv40_state_sr; /* nv40_vbo.c */ extern void nv40_draw_arrays(struct pipe_context *, unsigned mode, diff --git a/src/gallium/drivers/nv40/nv40_state_zsa.c b/src/gallium/drivers/nv40/nv40_state_zsa.c deleted file mode 100644 index 00facd520af..00000000000 --- a/src/gallium/drivers/nv40/nv40_state_zsa.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "nv40_context.h" - -static boolean -nv40_state_zsa_validate(struct nvfx_context *nvfx) -{ - so_ref(nvfx->zsa->so, - &nvfx->state.hw[NVFX_STATE_ZSA]); - return TRUE; -} - -struct nvfx_state_entry nv40_state_zsa = { - .validate = nv40_state_zsa_validate, - .dirty = { - .pipe = NVFX_NEW_ZSA, - .hw = NVFX_STATE_ZSA - } -}; - -static boolean -nv40_state_sr_validate(struct nvfx_context *nvfx) -{ - struct nouveau_stateobj *so = so_new(2, 2, 0); - 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); - return TRUE; -} - -struct nvfx_state_entry nv40_state_sr = { - .validate = nv40_state_sr_validate, - .dirty = { - .pipe = NVFX_NEW_SR, - .hw = NVFX_STATE_SR - } -}; diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile index 8f4edb6543b..b077713b047 100644 --- a/src/gallium/drivers/nvfx/Makefile +++ b/src/gallium/drivers/nvfx/Makefile @@ -9,6 +9,7 @@ C_SOURCES = \ nvfx_state_blend.c \ nvfx_state_rasterizer.c \ nvfx_state_scissor.c \ + nvfx_state_zsa.c \ nvfx_transfer.c include ../../Makefile.template diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h index d5817ac5f89..d97cf30a1df 100644 --- a/src/gallium/drivers/nvfx/nvfx_context.h +++ b/src/gallium/drivers/nvfx/nvfx_context.h @@ -185,6 +185,8 @@ extern struct nvfx_state_entry nvfx_state_blend; extern struct nvfx_state_entry nvfx_state_blend_colour; extern struct nvfx_state_entry nvfx_state_rasterizer; extern struct nvfx_state_entry nvfx_state_scissor; +extern struct nvfx_state_entry nvfx_state_sr; +extern struct nvfx_state_entry nvfx_state_zsa; /* nvfx_clear.c */ extern void nvfx_clear(struct pipe_context *pipe, unsigned buffers, diff --git a/src/gallium/drivers/nvfx/nvfx_state_emit.c b/src/gallium/drivers/nvfx/nvfx_state_emit.c index cf73f81fb2c..a30af174e3f 100644 --- a/src/gallium/drivers/nvfx/nvfx_state_emit.c +++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c @@ -14,8 +14,8 @@ static struct nvfx_state_entry *name##_render_states[] = { \ &nvxx##_state_vertprog, \ &nvfx_state_blend, \ &nvfx_state_blend_colour, \ - &nvxx##_state_zsa, \ - &nvxx##_state_sr, \ + &nvfx_state_zsa, \ + &nvfx_state_sr, \ &nvxx##_state_viewport, \ &nvxx##_state_##vbo, \ NULL \ diff --git a/src/gallium/drivers/nv30/nv30_state_zsa.c b/src/gallium/drivers/nvfx/nvfx_state_zsa.c similarity index 69% rename from src/gallium/drivers/nv30/nv30_state_zsa.c rename to src/gallium/drivers/nvfx/nvfx_state_zsa.c index 0832408edf2..c84fd041c1e 100644 --- a/src/gallium/drivers/nv30/nv30_state_zsa.c +++ b/src/gallium/drivers/nvfx/nvfx_state_zsa.c @@ -1,15 +1,15 @@ -#include "nv30_context.h" +#include "nvfx_context.h" static boolean -nv30_state_zsa_validate(struct nvfx_context *nvfx) +nvfx_state_zsa_validate(struct nvfx_context *nvfx) { so_ref(nvfx->zsa->so, &nvfx->state.hw[NVFX_STATE_ZSA]); return TRUE; } -struct nvfx_state_entry nv30_state_zsa = { - .validate = nv30_state_zsa_validate, +struct nvfx_state_entry nvfx_state_zsa = { + .validate = nvfx_state_zsa_validate, .dirty = { .pipe = NVFX_NEW_ZSA, .hw = NVFX_STATE_ZSA @@ -17,7 +17,7 @@ struct nvfx_state_entry nv30_state_zsa = { }; static boolean -nv30_state_sr_validate(struct nvfx_context *nvfx) +nvfx_state_sr_validate(struct nvfx_context *nvfx) { struct nouveau_stateobj *so = so_new(2, 2, 0); struct pipe_stencil_ref *sr = &nvfx->stencil_ref; @@ -32,8 +32,8 @@ nv30_state_sr_validate(struct nvfx_context *nvfx) return TRUE; } -struct nvfx_state_entry nv30_state_sr = { - .validate = nv30_state_sr_validate, +struct nvfx_state_entry nvfx_state_sr = { + .validate = nvfx_state_sr_validate, .dirty = { .pipe = NVFX_NEW_SR, .hw = NVFX_STATE_SR -- 2.30.2