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

The files are identical, except for the fact that the nv40 version
forgets to unreference the stateobj.

Unified to the correct nv30 version.

9 files changed, 7 insertions, 48 deletions

diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
index 8f198ff2b7..5541a36618 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_stipple.c \
 	nv30_state_viewport.c \
 	nv30_surface.c \
 	nv30_vbo.c \
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 2ee12ef5d8..1c2572aa86 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_stipple;
 extern struct nvfx_state_entry nv30_state_fragprog;
 extern struct nvfx_state_entry nv30_state_vertprog;
 extern struct nvfx_state_entry nv30_state_viewport;
diff --git a/src/gallium/drivers/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
index 1cad9409ed..a101cfc80c 100644
--- 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_stipple.c \
 	nv40_state_viewport.c \
 	nv40_surface.c \
 	nv40_vbo.c \
diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index 3dcbbae30b..127502dd5f 100644
--- 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_stipple;
 extern struct nvfx_state_entry nv40_state_fragprog;
 extern struct nvfx_state_entry nv40_state_vertprog;
 extern struct nvfx_state_entry nv40_state_viewport;
diff --git a/src/gallium/drivers/nv40/nv40_state_stipple.c b/src/gallium/drivers/nv40/nv40_state_stipple.c
deleted file mode 100644
index e537e08e1d..0000000000
--- a/src/gallium/drivers/nv40/nv40_state_stipple.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "nv40_context.h"
-
-static boolean
-nv40_state_stipple_validate(struct nvfx_context *nvfx)
-{
-	struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
-	struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
-	struct nouveau_stateobj *so;
-
-	if (nvfx->state.hw[NVFX_STATE_STIPPLE] &&
-	   (rast->poly_stipple_enable == 0 && nvfx->state.stipple_enabled == 0))
-		return FALSE;
-
-	if (rast->poly_stipple_enable) {
-		unsigned i;
-
-		so = so_new(2, 33, 0);
-		so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
-		so_data  (so, 1);
-		so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
-		for (i = 0; i < 32; i++)
-			so_data(so, nvfx->stipple[i]);
-	} else {
-		so = so_new(1, 1, 0);
-		so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
-		so_data  (so, 0);
-	}
-
-	so_ref(so, &nvfx->state.hw[NVFX_STATE_STIPPLE]);
-	return TRUE;
-}
-
-struct nvfx_state_entry nv40_state_stipple = {
-	.validate = nv40_state_stipple_validate,
-	.dirty = {
-		.pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
-		.hw = NVFX_STATE_STIPPLE,
-	}
-};
diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index b077713b04..e96c9aa6bc 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_stipple.c \
 	nvfx_state_zsa.c \
 	nvfx_transfer.c
 
diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index d97cf30a1d..8f5013a9d6 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -186,6 +186,7 @@ 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_stipple;
 extern struct nvfx_state_entry nvfx_state_zsa;
 
 /* nvfx_clear.c */
diff --git a/src/gallium/drivers/nvfx/nvfx_state_emit.c b/src/gallium/drivers/nvfx/nvfx_state_emit.c
index a30af174e3..04c0429ce1 100644
--- a/src/gallium/drivers/nvfx/nvfx_state_emit.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c
@@ -8,7 +8,7 @@ static struct nvfx_state_entry *name##_render_states[] = { \
 	&nvxx##_state_framebuffer, \
 	&nvfx_state_rasterizer, \
 	&nvfx_state_scissor, \
-	&nvxx##_state_stipple, \
+	&nvfx_state_stipple, \
 	&nvxx##_state_fragprog, \
 	&nvxx##_state_fragtex, \
 	&nvxx##_state_vertprog, \
diff --git a/src/gallium/drivers/nv30/nv30_state_stipple.c b/src/gallium/drivers/nvfx/nvfx_state_stipple.c
index eceb0c57f9..57cd3c936a 100644
--- a/src/gallium/drivers/nv30/nv30_state_stipple.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_stipple.c
@@ -1,7 +1,7 @@
-#include "nv30_context.h"
+#include "nvfx_context.h"
 
 static boolean
-nv30_state_stipple_validate(struct nvfx_context *nvfx)
+nvfx_state_stipple_validate(struct nvfx_context *nvfx)
 {
 	struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
 	struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
@@ -31,8 +31,8 @@ nv30_state_stipple_validate(struct nvfx_context *nvfx)
 	return TRUE;
 }
 
-struct nvfx_state_entry nv30_state_stipple = {
-	.validate = nv30_state_stipple_validate,
+struct nvfx_state_entry nvfx_state_stipple = {
+	.validate = nvfx_state_stipple_validate,
 	.dirty = {
 		.pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
 		.hw = NVFX_STATE_STIPPLE,