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

diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
index 668f5965b16653fca07d4cd7c59ea8b6f80ca3af..bbfca55e495140430391a0ddc7dabd29d9731b8b 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_scissor.c \
        nv30_state_stipple.c \
        nv30_state_viewport.c \
        nv30_state_zsa.c \

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index fbafbec383a755348d557407df98e3d68e69725f..5a5311e5a9c78c42f934afca7a492df392965645 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_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;

diff --git a/src/gallium/drivers/nv30/nv30_state_scissor.c b/src/gallium/drivers/nv30/nv30_state_scissor.c
deleted file mode 100644 (file)
index e91680e..0000000
--- a/src/gallium/drivers/nv30/nv30_state_scissor.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "nv30_context.h"
-
-static boolean
-nv30_state_scissor_validate(struct nvfx_context *nvfx)
-{
-       struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
-       struct pipe_scissor_state *s = &nvfx->scissor;
-       struct nouveau_stateobj *so;
-
-       if (nvfx->state.hw[NVFX_STATE_SCISSOR] &&
-           (rast->scissor == 0 && nvfx->state.scissor_enabled == 0))
-               return FALSE;
-       nvfx->state.scissor_enabled = rast->scissor;
-
-       so = so_new(1, 2, 0);
-       so_method(so, nvfx->screen->eng3d, NV34TCL_SCISSOR_HORIZ, 2);
-       if (nvfx->state.scissor_enabled) {
-               so_data  (so, ((s->maxx - s->minx) << 16) | s->minx);
-               so_data  (so, ((s->maxy - s->miny) << 16) | s->miny);
-       } else {
-               so_data  (so, 4096 << 16);
-               so_data  (so, 4096 << 16);
-       }
-
-       so_ref(so, &nvfx->state.hw[NVFX_STATE_SCISSOR]);
-       so_ref(NULL, &so);
-       return TRUE;
-}
-
-struct nvfx_state_entry nv30_state_scissor = {
-       .validate = nv30_state_scissor_validate,
-       .dirty = {
-               .pipe = NVFX_NEW_SCISSOR | NVFX_NEW_RAST,
-               .hw = NVFX_STATE_SCISSOR
-       }
-};

diff --git a/src/gallium/drivers/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
index 25ad2974bf04da6304fd547f5eabae8345ff4b8d..02bbb15f81d903fccd3a2af983ff86a5037eabd6 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_scissor.c \
        nv40_state_stipple.c \
        nv40_state_viewport.c \
        nv40_state_zsa.c \

diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index fc8b06bd0f3b90d53bd367210a2980845b4365f5..d3464ad7a3b5457ed07e569bf98ff1dd4712b5e9 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_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;

diff --git a/src/gallium/drivers/nv40/nv40_state_scissor.c b/src/gallium/drivers/nv40/nv40_state_scissor.c
deleted file mode 100644 (file)
index 11ec5c0..0000000
--- a/src/gallium/drivers/nv40/nv40_state_scissor.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "nv40_context.h"
-
-static boolean
-nv40_state_scissor_validate(struct nvfx_context *nvfx)
-{
-       struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
-       struct pipe_scissor_state *s = &nvfx->scissor;
-       struct nouveau_stateobj *so;
-
-       if (nvfx->state.hw[NVFX_STATE_SCISSOR] &&
-           (rast->scissor == 0 && nvfx->state.scissor_enabled == 0))
-               return FALSE;
-       nvfx->state.scissor_enabled = rast->scissor;
-
-       so = so_new(1, 2, 0);
-       so_method(so, nvfx->screen->eng3d, NV34TCL_SCISSOR_HORIZ, 2);
-       if (nvfx->state.scissor_enabled) {
-               so_data  (so, ((s->maxx - s->minx) << 16) | s->minx);
-               so_data  (so, ((s->maxy - s->miny) << 16) | s->miny);
-       } else {
-               so_data  (so, 4096 << 16);
-               so_data  (so, 4096 << 16);
-       }
-
-       so_ref(so, &nvfx->state.hw[NVFX_STATE_SCISSOR]);
-       so_ref(NULL, &so);
-       return TRUE;
-}
-
-struct nvfx_state_entry nv40_state_scissor = {
-       .validate = nv40_state_scissor_validate,
-       .dirty = {
-               .pipe = NVFX_NEW_SCISSOR | NVFX_NEW_RAST,
-               .hw = NVFX_STATE_SCISSOR
-       }
-};

diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index f1843b61df0bcf1e6c33c69ebf94cbd89d3fe429..8f4edb6543bf8f17f91691d510037a647d475a92 100644 (file)
--- a/src/gallium/drivers/nvfx/Makefile
+++ b/src/gallium/drivers/nvfx/Makefile
@@ -8,6 +8,7 @@ C_SOURCES = \
        nvfx_state_emit.c \
        nvfx_state_blend.c \
        nvfx_state_rasterizer.c \
+       nvfx_state_scissor.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 c7ce17ab382b88777ca34192ffa519caf7b0bd5e..d5817ac5f89d95b4a244432d43d3c43371ba00f8 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -184,6 +184,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;
+extern struct nvfx_state_entry nvfx_state_scissor;
 
 /* 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 60df50aa1cc8db1c18d86770847bc7ab0137fe4c..cf73f81fb2c35a70f12f91390f8134e7d91571fe 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_state_emit.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c
@@ -7,7 +7,7 @@
 static struct nvfx_state_entry *name##_render_states[] = { \
        &nvxx##_state_framebuffer, \
        &nvfx_state_rasterizer, \
-       &nvxx##_state_scissor, \
+       &nvfx_state_scissor, \
        &nvxx##_state_stipple, \
        &nvxx##_state_fragprog, \
        &nvxx##_state_fragtex, \

diff --git a/src/gallium/drivers/nvfx/nvfx_state_scissor.c b/src/gallium/drivers/nvfx/nvfx_state_scissor.c
new file mode 100644 (file)
index 0000000..940d8cb
--- /dev/null
+++ b/src/gallium/drivers/nvfx/nvfx_state_scissor.c
@@ -0,0 +1,36 @@
+#include "nvfx_context.h"
+
+static boolean
+nvfx_state_scissor_validate(struct nvfx_context *nvfx)
+{
+       struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
+       struct pipe_scissor_state *s = &nvfx->scissor;
+       struct nouveau_stateobj *so;
+
+       if (nvfx->state.hw[NVFX_STATE_SCISSOR] &&
+           (rast->scissor == 0 && nvfx->state.scissor_enabled == 0))
+               return FALSE;
+       nvfx->state.scissor_enabled = rast->scissor;
+
+       so = so_new(1, 2, 0);
+       so_method(so, nvfx->screen->eng3d, NV34TCL_SCISSOR_HORIZ, 2);
+       if (nvfx->state.scissor_enabled) {
+               so_data  (so, ((s->maxx - s->minx) << 16) | s->minx);
+               so_data  (so, ((s->maxy - s->miny) << 16) | s->miny);
+       } else {
+               so_data  (so, 4096 << 16);
+               so_data  (so, 4096 << 16);
+       }
+
+       so_ref(so, &nvfx->state.hw[NVFX_STATE_SCISSOR]);
+       so_ref(NULL, &so);
+       return TRUE;
+}
+
+struct nvfx_state_entry nvfx_state_scissor = {
+       .validate = nvfx_state_scissor_validate,
+       .dirty = {
+               .pipe = NVFX_NEW_SCISSOR | NVFX_NEW_RAST,
+               .hw = NVFX_STATE_SCISSOR
+       }
+};