nv30, nv40: unify identical nv[34]0_state_rasterizer.c

diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
index 66dad8f3586191718ac1e86cfebce5ae6401e4fd..668f5965b16653fca07d4cd7c59ea8b6f80ca3af 100644 (file)
--- 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 e6194b23f5fa2100eef77e5590e413685fa76fad..fbafbec383a755348d557407df98e3d68e69725f 100644 (file)
--- 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 (file)
index 1a83da5..0000000
--- 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
-       }
-};

diff --git a/src/gallium/drivers/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
index 739ca43387638418156005a6039dc51e7f705a0b..25ad2974bf04da6304fd547f5eabae8345ff4b8d 100644 (file)
--- a/src/gallium/drivers/nv40/Makefile
+++ b/src/gallium/drivers/nv40/Makefile
@@ -13,7 +13,6 @@ C_SOURCES = \
        nv40_screen.c \
        nv40_state.c \
        nv40_state_fb.c \
-       nv40_state_rasterizer.c \
        nv40_state_scissor.c \
        nv40_state_stipple.c \
        nv40_state_viewport.c \

diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index 28a79e4ecffab727b444247256e0c86d75df7443..fc8b06bd0f3b90d53bd367210a2980845b4365f5 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -28,7 +28,6 @@ extern void nv40_fragprog_destroy(struct nvfx_context *,
 extern void nv40_fragtex_bind(struct nvfx_context *);
 
 /* nv40_state.c and friends */
-extern struct nvfx_state_entry nv40_state_rasterizer;
 extern struct nvfx_state_entry nv40_state_scissor;
 extern struct nvfx_state_entry nv40_state_stipple;
 extern struct nvfx_state_entry nv40_state_fragprog;

diff --git a/src/gallium/drivers/nv40/nv40_state_rasterizer.c b/src/gallium/drivers/nv40/nv40_state_rasterizer.c
deleted file mode 100644 (file)
index d6136a2..0000000
--- a/src/gallium/drivers/nv40/nv40_state_rasterizer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "nv40_context.h"
-
-static boolean
-nv40_state_rasterizer_validate(struct nvfx_context *nvfx)
-{
-       so_ref(nvfx->rasterizer->so,
-              &nvfx->state.hw[NVFX_STATE_RAST]);
-       return TRUE;
-}
-
-struct nvfx_state_entry nv40_state_rasterizer = {
-       .validate = nv40_state_rasterizer_validate,
-       .dirty = {
-               .pipe = NVFX_NEW_RAST,
-               .hw = NVFX_STATE_RAST
-       }
-};

diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index d124de89ec8768f62ce03abd649dfaa96381c206..f1843b61df0bcf1e6c33c69ebf94cbd89d3fe429 100644 (file)
--- a/src/gallium/drivers/nvfx/Makefile
+++ b/src/gallium/drivers/nvfx/Makefile
@@ -7,6 +7,7 @@ C_SOURCES = \
        nvfx_clear.c \
        nvfx_state_emit.c \
        nvfx_state_blend.c \
+       nvfx_state_rasterizer.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 bbffb8a18d2f72b4097b6e3e04cb41cc843febc1..c7ce17ab382b88777ca34192ffa519caf7b0bd5e 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -183,6 +183,7 @@ struct nvfx_state_entry {
 
 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;
 
 /* 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 059bbb14b72ac8b22aaa7a9a32a51d69a57395e3..60df50aa1cc8db1c18d86770847bc7ab0137fe4c 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_state_emit.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c
@@ -6,7 +6,7 @@
 #define RENDER_STATES(name, nvxx, vbo) \
 static struct nvfx_state_entry *name##_render_states[] = { \
        &nvxx##_state_framebuffer, \
-       &nvxx##_state_rasterizer, \
+       &nvfx_state_rasterizer, \
        &nvxx##_state_scissor, \
        &nvxx##_state_stipple, \
        &nvxx##_state_fragprog, \

diff --git a/src/gallium/drivers/nvfx/nvfx_state_rasterizer.c b/src/gallium/drivers/nvfx/nvfx_state_rasterizer.c
new file mode 100644 (file)
index 0000000..0d35ecb
--- /dev/null
+++ b/src/gallium/drivers/nvfx/nvfx_state_rasterizer.c
@@ -0,0 +1,17 @@
+#include "nvfx_context.h"
+
+static boolean
+nvfx_state_rasterizer_validate(struct nvfx_context *nvfx)
+{
+       so_ref(nvfx->rasterizer->so,
+              &nvfx->state.hw[NVFX_STATE_RAST]);
+       return TRUE;
+}
+
+struct nvfx_state_entry nvfx_state_rasterizer = {
+       .validate = nvfx_state_rasterizer_validate,
+       .dirty = {
+               .pipe = NVFX_NEW_RAST,
+               .hw = NVFX_STATE_RAST
+       }
+};