From 26add9288c88108e3485ffc57c51ea9bdc0ee719 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb@gmail.com>
Date: Sat, 16 Feb 2008 17:23:12 +1100
Subject: nouveau: match gallium code reorginisation.

That was... fun..
---
 src/gallium/drivers/nv30/nv30_state_emit.c | 83 ++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/gallium/drivers/nv30/nv30_state_emit.c

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
new file mode 100644
index 0000000000..70b98836f0
--- /dev/null
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -0,0 +1,83 @@
+#include "nv30_context.h"
+#include "nv30_state.h"
+
+void
+nv30_emit_hw_state(struct nv30_context *nv30)
+{
+	int i;
+
+	if (nv30->dirty & NV30_NEW_FRAGPROG) {
+		nv30_fragprog_bind(nv30, nv30->fragprog.current);
+		/*XXX: clear NV30_NEW_FRAGPROG if no new program uploaded */
+	}
+
+	if (nv30->dirty_samplers || (nv30->dirty & NV30_NEW_FRAGPROG)) {
+		nv30_fragtex_bind(nv30);
+/*
+		BEGIN_RING(rankine, NV34TCL_TX_CACHE_CTL, 1);
+		OUT_RING  (2);
+		BEGIN_RING(rankine, NV34TCL_TX_CACHE_CTL, 1);
+		OUT_RING  (1);*/
+		nv30->dirty &= ~NV30_NEW_FRAGPROG;
+	}
+
+	if (nv30->dirty & NV30_NEW_VERTPROG) {
+		nv30_vertprog_bind(nv30, nv30->vertprog.current);
+		nv30->dirty &= ~NV30_NEW_VERTPROG;
+	}
+
+	nv30->dirty_samplers = 0;
+
+	/* Emit relocs for every referenced buffer.
+	 * This is to ensure the bufmgr has an accurate idea of how
+	 * the buffer is used.  This isn't very efficient, but we don't
+	 * seem to take a significant performance hit.  Will be improved
+	 * at some point.  Vertex arrays are emitted by nv30_vbo.c
+	 */
+
+	/* Render targets */
+	if (nv30->rt_enable & NV34TCL_RT_ENABLE_COLOR0) {
+		BEGIN_RING(rankine, NV34TCL_DMA_COLOR0, 1);
+		OUT_RELOCo(nv30->rt[0], NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+		BEGIN_RING(rankine, NV34TCL_COLOR0_OFFSET, 1);
+		OUT_RELOCl(nv30->rt[0], 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+	}
+
+	if (nv30->rt_enable & NV34TCL_RT_ENABLE_COLOR1) {
+		BEGIN_RING(rankine, NV34TCL_DMA_COLOR1, 1);
+		OUT_RELOCo(nv30->rt[1], NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+		BEGIN_RING(rankine, NV34TCL_COLOR1_OFFSET, 1);
+		OUT_RELOCl(nv30->rt[1], 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+	}
+
+	if (nv30->zeta) {
+		BEGIN_RING(rankine, NV34TCL_DMA_ZETA, 1);
+		OUT_RELOCo(nv30->zeta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+		BEGIN_RING(rankine, NV34TCL_ZETA_OFFSET, 1);
+		OUT_RELOCl(nv30->zeta, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+		/* XXX allocate LMA */
+/*		BEGIN_RING(rankine, NV34TCL_LMA_DEPTH_OFFSET, 1);
+		OUT_RING(0);*/
+	}
+
+	/* Texture images */
+	for (i = 0; i < 16; i++) {
+		if (!(nv30->fp_samplers & (1 << i)))
+			continue;
+		BEGIN_RING(rankine, NV34TCL_TX_OFFSET(i), 2);
+		OUT_RELOCl(nv30->tex[i].buffer, 0, NOUVEAU_BO_VRAM |
+			   NOUVEAU_BO_GART | NOUVEAU_BO_RD);
+		OUT_RELOCd(nv30->tex[i].buffer, nv30->tex[i].format,
+			   NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD |
+			   NOUVEAU_BO_OR, NV34TCL_TX_FORMAT_DMA0,
+			   NV34TCL_TX_FORMAT_DMA1);
+	}
+
+	/* Fragment program */
+	BEGIN_RING(rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);
+	OUT_RELOC (nv30->fragprog.active->buffer, 0, NOUVEAU_BO_VRAM |
+	           NOUVEAU_BO_GART | NOUVEAU_BO_RD | NOUVEAU_BO_LOW |
+		   NOUVEAU_BO_OR, NV34TCL_FP_ACTIVE_PROGRAM_DMA0,
+		   NV34TCL_FP_ACTIVE_PROGRAM_DMA1);
+}
+
-- 
cgit v1.2.3


From e4b5008de46659f13fca7dcd1b587504e9d4484c Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Tue, 18 Mar 2008 13:34:26 +0100
Subject: nv30: hmm, no buffer for texture

---
 src/gallium/drivers/nv30/nv30_state_emit.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 70b98836f0..2cb4692e17 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -64,6 +64,8 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 	for (i = 0; i < 16; i++) {
 		if (!(nv30->fp_samplers & (1 << i)))
 			continue;
+		if (!nv30->tex[i].buffer)
+			continue;
 		BEGIN_RING(rankine, NV34TCL_TX_OFFSET(i), 2);
 		OUT_RELOCl(nv30->tex[i].buffer, 0, NOUVEAU_BO_VRAM |
 			   NOUVEAU_BO_GART | NOUVEAU_BO_RD);
-- 
cgit v1.2.3


From 75e714d476eb573a6e06585341ce693434eb237e Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Tue, 18 Mar 2008 21:50:01 +0100
Subject: nv30: disable emit texture image in state_emit, already done in
 fragtex

---
 src/gallium/drivers/nv30/nv30_context.h    | 4 ++--
 src/gallium/drivers/nv30/nv30_state_emit.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 0ee6cfdb33..c1cc3eca1e 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -51,10 +51,10 @@ struct nv30_context {
 	struct pipe_buffer *rt[2];
 	struct pipe_buffer *zeta;
 
-	struct {
+	/*struct {
 		struct pipe_buffer *buffer;
 		uint32_t format;
-	} tex[16];
+	} tex[16];*/
 
 	unsigned vb_enable;
 	struct {
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 2cb4692e17..eda2fd45f5 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -60,12 +60,11 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 		OUT_RING(0);*/
 	}
 
-	/* Texture images */
+	/* Texture images, emitted in nv30_fragtex_build */
+#if 0
 	for (i = 0; i < 16; i++) {
 		if (!(nv30->fp_samplers & (1 << i)))
 			continue;
-		if (!nv30->tex[i].buffer)
-			continue;
 		BEGIN_RING(rankine, NV34TCL_TX_OFFSET(i), 2);
 		OUT_RELOCl(nv30->tex[i].buffer, 0, NOUVEAU_BO_VRAM |
 			   NOUVEAU_BO_GART | NOUVEAU_BO_RD);
@@ -74,6 +73,7 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 			   NOUVEAU_BO_OR, NV34TCL_TX_FORMAT_DMA0,
 			   NV34TCL_TX_FORMAT_DMA1);
 	}
+#endif
 
 	/* Fragment program */
 	BEGIN_RING(rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);
-- 
cgit v1.2.3


From 36488ed052a18f7eafef1d1c5c18b20ad508b2b7 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 20:58:31 +0200
Subject: nv30: Emit framebuffer state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    |   3 +
 src/gallium/drivers/nv30/nv30_state.c      | 105 +--------------------------
 src/gallium/drivers/nv30/nv30_state_emit.c | 111 ++++++++++++++++++++---------
 src/gallium/drivers/nv30/nv30_state_fb.c   |  35 ++-------
 src/gallium/drivers/nv30/nv30_vbo.c        |   2 +
 5 files changed, 92 insertions(+), 164 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index dce077b2b4..4a6c1d2f47 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -99,6 +99,7 @@ struct nv30_state {
 	unsigned stipple_enabled;
 	unsigned viewport_bypass;
 
+	uint64_t dirty;
 	struct nouveau_stateobj *hw[NV30_STATE_MAX];
 };
 
@@ -208,8 +209,10 @@ extern void nv30_fragprog_destroy(struct nv30_context *,
 extern void nv30_fragtex_bind(struct nv30_context *);
 
 /* nv30_state.c and friends */
+extern boolean nv30_state_validate(struct nv30_context *nv30);
 extern void nv30_emit_hw_state(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
+extern struct nv30_state_entry nv30_state_framebuffer;
 
 /* nv30_vbo.c */
 extern boolean nv30_draw_arrays(struct pipe_context *, unsigned mode,
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index c1618041bb..3edfb0874d 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -565,110 +565,9 @@ nv30_set_framebuffer_state(struct pipe_context *pipe,
 			   const struct pipe_framebuffer_state *fb)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	struct pipe_surface *rt[2], *zeta = NULL;
-	uint32_t rt_enable, rt_format, w = 0, h = 0;
-	int i, colour_format = 0, zeta_format = 0;
-
-	rt_enable = 0;
-	for (i = 0; i < 2; i++) {
-		if (!fb->cbufs[i])
-			continue;
-
-		if (colour_format) {
-			assert(w == fb->cbufs[i]->width);
-			assert(h == fb->cbufs[i]->height);
-			assert(colour_format == fb->cbufs[i]->format);
-		} else {
-			w = fb->cbufs[i]->width;
-			h = fb->cbufs[i]->height;
-			colour_format = fb->cbufs[i]->format;
-			rt_enable |= (NV34TCL_RT_ENABLE_COLOR0 << i);
-			rt[i] = fb->cbufs[i];
-		}
-	}
-
-	if (rt_enable & (NV34TCL_RT_ENABLE_COLOR1 | NV34TCL_RT_ENABLE_COLOR2 |
-			 NV34TCL_RT_ENABLE_COLOR3))
-		rt_enable |= NV34TCL_RT_ENABLE_MRT;
-
-	if (fb->zsbuf) {
-		if (colour_format) {
-			assert(w == fb->zsbuf->width);
-			assert(h == fb->zsbuf->height);
-		} else {
-			w = fb->zsbuf->width;
-			h = fb->zsbuf->height;
-		}
-
-		zeta_format = fb->zsbuf->format;
-		zeta = fb->zsbuf;
-	}
-
-	rt_format = NV34TCL_RT_FORMAT_TYPE_LINEAR;
-
-	switch (colour_format) {
-	case PIPE_FORMAT_A8R8G8B8_UNORM:
-	case 0:
-		rt_format |= NV34TCL_RT_FORMAT_COLOR_A8R8G8B8;
-		break;
-	case PIPE_FORMAT_R5G6B5_UNORM:
-		rt_format |= NV34TCL_RT_FORMAT_COLOR_R5G6B5;
-		break;
-	default:
-		assert(0);
-	}
-
-	switch (zeta_format) {
-	case PIPE_FORMAT_Z16_UNORM:
-		rt_format |= NV34TCL_RT_FORMAT_ZETA_Z16;
-		break;
-	case PIPE_FORMAT_Z24S8_UNORM:
-	case 0:
-		rt_format |= NV34TCL_RT_FORMAT_ZETA_Z24S8;
-		break;
-	default:
-		assert(0);
-	}
-
-	if (rt_enable & NV34TCL_RT_ENABLE_COLOR0) {
-		uint32_t pitch = rt[0]->stride;
-		if (zeta) {
-			pitch |= (zeta->stride << 16);
-		} else {
-			pitch |= (pitch << 16);
-		}
-
-		BEGIN_RING(rankine, NV34TCL_COLOR0_PITCH, 1);
-		OUT_RING  (pitch);
-		nv30->rt[0] = rt[0]->buffer;
-	}
-
-	if (rt_enable & NV34TCL_RT_ENABLE_COLOR1) {
-		BEGIN_RING(rankine, NV34TCL_COLOR1_PITCH, 1);
-		OUT_RING  (rt[1]->stride);
-		nv30->rt[1] = rt[1]->buffer;
-	}
-
-	if (zeta_format)
-	{
-		nv30->zeta = zeta->buffer;
-	}
 
-	nv30->rt_enable = rt_enable;
-	BEGIN_RING(rankine, NV34TCL_RT_ENABLE, 1);
-	OUT_RING  (rt_enable);
-	BEGIN_RING(rankine, NV34TCL_RT_HORIZ, 3);
-	OUT_RING  ((w << 16) | 0);
-	OUT_RING  ((h << 16) | 0);
-	OUT_RING  (rt_format);
-	BEGIN_RING(rankine, NV34TCL_VIEWPORT_HORIZ, 2);
-	OUT_RING  ((w << 16) | 0);
-	OUT_RING  ((h << 16) | 0);
-	BEGIN_RING(rankine, NV34TCL_VIEWPORT_CLIP_HORIZ(0), 2);
-	OUT_RING  (((w - 1) << 16) | 0);
-	OUT_RING  (((h - 1) << 16) | 0);
-	BEGIN_RING(rankine, NV34TCL_VIEWPORT_TX_ORIGIN, 1);
-	OUT_RING  (0);
+	nv30->framebuffer = *fb;
+	nv30->dirty |= NV30_NEW_FB;
 }
 
 static void
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index eda2fd45f5..9a3954594a 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -1,10 +1,55 @@
 #include "nv30_context.h"
 #include "nv30_state.h"
 
+static struct nv30_state_entry *render_states[] = {
+	&nv30_state_framebuffer,
+	NULL
+};
+
+static void
+nv30_state_do_validate(struct nv30_context *nv30,
+		       struct nv30_state_entry **states)
+{
+	const struct pipe_framebuffer_state *fb = &nv30->framebuffer;
+	unsigned i;
+
+	for (i = 0; i < fb->num_cbufs; i++)
+		fb->cbufs[i]->status = PIPE_SURFACE_STATUS_DEFINED;
+	if (fb->zsbuf)
+		fb->zsbuf->status = PIPE_SURFACE_STATUS_DEFINED;
+
+	while (*states) {
+		struct nv30_state_entry *e = *states;
+
+		if (nv30->dirty & e->dirty.pipe) {
+			if (e->validate(nv30)) {
+				nv30->state.dirty |= (1ULL << e->dirty.hw);
+			}
+		}
+
+		states++;
+	}
+
+/*	TODO: uncomment when finished converting
+	nv30->dirty = 0;
+*/
+}
+
 void
 nv30_emit_hw_state(struct nv30_context *nv30)
 {
-	int i;
+	struct nv30_state *state = &nv30->state;
+	unsigned i;
+	uint64 states;
+
+	for (i = 0, states = state->dirty; states; i++) {
+		if (!(states & (1ULL << i)))
+			continue;
+		so_ref (state->hw[i], &nv30->screen->state[i]);
+		if (state->hw[i])
+			so_emit(nv30->nvws, nv30->screen->state[i]);
+		states &= ~(1ULL << i);
+	}
 
 	if (nv30->dirty & NV30_NEW_FRAGPROG) {
 		nv30_fragprog_bind(nv30, nv30->fragprog.current);
@@ -28,37 +73,7 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 
 	nv30->dirty_samplers = 0;
 
-	/* Emit relocs for every referenced buffer.
-	 * This is to ensure the bufmgr has an accurate idea of how
-	 * the buffer is used.  This isn't very efficient, but we don't
-	 * seem to take a significant performance hit.  Will be improved
-	 * at some point.  Vertex arrays are emitted by nv30_vbo.c
-	 */
-
-	/* Render targets */
-	if (nv30->rt_enable & NV34TCL_RT_ENABLE_COLOR0) {
-		BEGIN_RING(rankine, NV34TCL_DMA_COLOR0, 1);
-		OUT_RELOCo(nv30->rt[0], NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
-		BEGIN_RING(rankine, NV34TCL_COLOR0_OFFSET, 1);
-		OUT_RELOCl(nv30->rt[0], 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
-	}
-
-	if (nv30->rt_enable & NV34TCL_RT_ENABLE_COLOR1) {
-		BEGIN_RING(rankine, NV34TCL_DMA_COLOR1, 1);
-		OUT_RELOCo(nv30->rt[1], NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
-		BEGIN_RING(rankine, NV34TCL_COLOR1_OFFSET, 1);
-		OUT_RELOCl(nv30->rt[1], 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
-	}
-
-	if (nv30->zeta) {
-		BEGIN_RING(rankine, NV34TCL_DMA_ZETA, 1);
-		OUT_RELOCo(nv30->zeta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
-		BEGIN_RING(rankine, NV34TCL_ZETA_OFFSET, 1);
-		OUT_RELOCl(nv30->zeta, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
-		/* XXX allocate LMA */
-/*		BEGIN_RING(rankine, NV34TCL_LMA_DEPTH_OFFSET, 1);
-		OUT_RING(0);*/
-	}
+	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
 
 	/* Texture images, emitted in nv30_fragtex_build */
 #if 0
@@ -83,3 +98,35 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 		   NV34TCL_FP_ACTIVE_PROGRAM_DMA1);
 }
 
+boolean
+nv30_state_validate(struct nv30_context *nv30)
+{
+#if 0
+	boolean was_sw = nv30->fallback_swtnl ? TRUE : FALSE;
+
+	if (nv30->render_mode != HW) {
+		/* Don't even bother trying to go back to hw if none
+		 * of the states that caused swtnl previously have changed.
+		 */
+		if ((nv30->fallback_swtnl & nv30->dirty)
+				!= nv30->fallback_swtnl)
+			return FALSE;
+
+		/* Attempt to go to hwtnl again */
+		nv30->pipe.flush(&nv30->pipe, 0, NULL);
+		nv30->dirty |= (NV30_NEW_VIEWPORT |
+				NV30_NEW_VERTPROG |
+				NV30_NEW_ARRAYS);
+		nv30->render_mode = HW;
+	}
+#endif
+	nv30_state_do_validate(nv30, render_states);
+#if 0
+	if (nv30->fallback_swtnl || nv30->fallback_swrast)
+		return FALSE;
+	
+	if (was_sw)
+		NOUVEAU_ERR("swtnl->hw\n");
+#endif
+	return TRUE;
+}
diff --git a/src/gallium/drivers/nv30/nv30_state_fb.c b/src/gallium/drivers/nv30/nv30_state_fb.c
index a20df9f75d..d93e2bb5c8 100644
--- a/src/gallium/drivers/nv30/nv30_state_fb.c
+++ b/src/gallium/drivers/nv30/nv30_state_fb.c
@@ -4,7 +4,7 @@ static boolean
 nv30_state_framebuffer_validate(struct nv30_context *nv30)
 {
 	struct pipe_framebuffer_state *fb = &nv30->framebuffer;
-	struct pipe_surface *rt[4], *zeta = NULL;
+	struct pipe_surface *rt[2], *zeta = NULL;
 	uint32_t rt_enable, rt_format;
 	int i, colour_format = 0, zeta_format = 0;
 	struct nouveau_stateobj *so = so_new(64, 10);
@@ -23,8 +23,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
 		}
 	}
 
-	if (rt_enable & (NV34TCL_RT_ENABLE_COLOR1 | NV34TCL_RT_ENABLE_COLOR2 |
-			 NV34TCL_RT_ENABLE_COLOR3))
+	if (rt_enable & NV34TCL_RT_ENABLE_COLOR1)
 		rt_enable |= NV34TCL_RT_ENABLE_MRT;
 
 	if (fb->zsbuf) {
@@ -86,31 +85,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
 			  NOUVEAU_BO_LOW, 0, 0);
 		so_data  (so, rt[1]->stride);
 	}
-/*
-	if (rt_enable & NV34TCL_RT_ENABLE_COLOR2) {
-		so_method(so, nv30->screen->rankine, NV34TCL_DMA_COLOR2, 1);
-		so_reloc (so, rt[2]->buffer, 0, rt_flags | NOUVEAU_BO_OR,
-			  nv30->nvws->channel->vram->handle,
-			  nv30->nvws->channel->gart->handle);
-		so_method(so, nv30->screen->rankine, NV34TCL_COLOR2_OFFSET, 1);
-		so_reloc (so, rt[2]->buffer, rt[2]->offset, rt_flags |
-			  NOUVEAU_BO_LOW, 0, 0);
-		so_method(so, nv30->screen->rankine, NV34TCL_COLOR2_PITCH, 1);
-		so_data  (so, rt[2]->pitch * rt[2]->cpp);
-	}
 
-	if (rt_enable & NV34TCL_RT_ENABLE_COLOR3) {
-		so_method(so, nv30->screen->rankine, NV34TCL_DMA_COLOR3, 1);
-		so_reloc (so, rt[3]->buffer, 0, rt_flags | NOUVEAU_BO_OR,
-			  nv30->nvws->channel->vram->handle,
-			  nv30->nvws->channel->gart->handle);
-		so_method(so, nv30->screen->rankine, NV34TCL_COLOR3_OFFSET, 1);
-		so_reloc (so, rt[3]->buffer, rt[3]->offset, rt_flags |
-			  NOUVEAU_BO_LOW, 0, 0);
-		so_method(so, nv30->screen->rankine, NV34TCL_COLOR3_PITCH, 1);
-		so_data  (so, rt[3]->pitch * rt[3]->cpp);
-	}
-*/
 	if (zeta_format) {
 		so_method(so, nv30->screen->rankine, NV34TCL_DMA_ZETA, 1);
 		so_reloc (so, zeta->buffer, 0, rt_flags | NOUVEAU_BO_OR,
@@ -119,8 +94,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
 		so_method(so, nv30->screen->rankine, NV34TCL_ZETA_OFFSET, 1);
 		so_reloc (so, zeta->buffer, zeta->offset, rt_flags |
 			  NOUVEAU_BO_LOW, 0, 0);
-		/*so_method(so, nv30->screen->rankine, NV34TCL_ZETA_PITCH, 1);
-		so_data  (so, zeta->pitch * zeta->cpp);*/
+		/* TODO: allocate LMA depth buffer */
 	}
 
 	so_method(so, nv30->screen->rankine, NV34TCL_RT_ENABLE, 1);
@@ -137,6 +111,9 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
 	so_data  (so, ((h - 1) << 16) | 0);
 	so_method(so, nv30->screen->rankine, 0x1d88, 1);
 	so_data  (so, (1 << 12) | h);
+	/* Wonder why this is needed, context should all be set to zero on init */
+	so_method(so, nv30->screen->rankine, NV34TCL_VIEWPORT_TX_ORIGIN, 1);
+	so_data  (so, 0);
 
 	so_ref(so, &nv30->state.hw[NV30_STATE_FB]);
 	return TRUE;
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index 359e443bb1..d23164eb48 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -154,6 +154,8 @@ nv30_vbo_validate_state(struct nv30_context *nv30,
 {
 	unsigned inputs;
 
+	nv30_state_validate(nv30);
+
 	nv30_emit_hw_state(nv30);
 
 	if (nv30->dirty & NV30_NEW_ARRAYS) {
-- 
cgit v1.2.3


From 52cf7a6c1ccc987859834b640a5ec0a62f84134a Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 21:11:07 +0200
Subject: nv30: Emit blend color state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    | 1 +
 src/gallium/drivers/nv30/nv30_state.c      | 7 ++-----
 src/gallium/drivers/nv30/nv30_state_emit.c | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 4a6c1d2f47..57cc991cd7 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -212,6 +212,7 @@ extern void nv30_fragtex_bind(struct nv30_context *);
 extern boolean nv30_state_validate(struct nv30_context *nv30);
 extern void nv30_emit_hw_state(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
+extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_framebuffer;
 
 /* nv30_vbo.c */
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 3edfb0874d..e67a701809 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -531,11 +531,8 @@ nv30_set_blend_color(struct pipe_context *pipe,
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 
-	BEGIN_RING(rankine, NV34TCL_BLEND_COLOR, 1);
-	OUT_RING  ((float_to_ubyte(bcol->color[3]) << 24) |
-		   (float_to_ubyte(bcol->color[0]) << 16) |
-		   (float_to_ubyte(bcol->color[1]) <<  8) |
-		   (float_to_ubyte(bcol->color[2]) <<  0));
+	nv30->blend_colour = *bcol;
+	nv30->dirty |= NV30_NEW_BCOL;
 }
 
 static void
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 9a3954594a..541ad0da3e 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -3,6 +3,7 @@
 
 static struct nv30_state_entry *render_states[] = {
 	&nv30_state_framebuffer,
+	&nv30_state_blend_colour,
 	NULL
 };
 
-- 
cgit v1.2.3


From c0e9eb3b095c9769d3deacf4ad4470bd155acdcd Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 21:25:47 +0200
Subject: nv30: Emit blend state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h     |  6 +--
 src/gallium/drivers/nv30/nv30_state.c       | 84 +++++++++++++++--------------
 src/gallium/drivers/nv30/nv30_state.h       | 14 -----
 src/gallium/drivers/nv30/nv30_state_blend.c |  2 +-
 src/gallium/drivers/nv30/nv30_state_emit.c  |  1 +
 5 files changed, 48 insertions(+), 59 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 57cc991cd7..eedebc91b2 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -87,8 +87,7 @@ struct nv30_zsa_state {
 	struct nouveau_stateobj *so;
 };
 
-/* TODO: rename when removing the old state emitter */
-struct nv30_blend_state_new {
+struct nv30_blend_state {
 	struct pipe_blend_state pipe;
 	struct nouveau_stateobj *so;
 };
@@ -125,7 +124,7 @@ struct nv30_context {
 	unsigned vp_samplers;
 
 	/* Context state */
-	struct nv30_blend_state_new *blend;
+	struct nv30_blend_state *blend;
 	struct pipe_blend_color blend_colour;
 	struct pipe_viewport_state viewport;
 	struct pipe_framebuffer_state framebuffer;
@@ -212,6 +211,7 @@ extern void nv30_fragtex_bind(struct nv30_context *);
 extern boolean nv30_state_validate(struct nv30_context *nv30);
 extern void nv30_emit_hw_state(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
+extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_framebuffer;
 
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index e67a701809..cf46dcef93 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -9,63 +9,65 @@ static void *
 nv30_blend_state_create(struct pipe_context *pipe,
 			const struct pipe_blend_state *cso)
 {
-	struct nv30_blend_state *cb;
-
-	cb = malloc(sizeof(struct nv30_blend_state));
-
-	cb->b_enable = cso->blend_enable ? 1 : 0;
-	cb->b_srcfunc = ((nvgl_blend_func(cso->alpha_src_factor)<<16) |
-			 (nvgl_blend_func(cso->rgb_src_factor)));
-	cb->b_dstfunc = ((nvgl_blend_func(cso->alpha_dst_factor)<<16) |
-			 (nvgl_blend_func(cso->rgb_dst_factor)));
-	cb->b_eqn = ((nvgl_blend_eqn(cso->alpha_func) << 16) |
-		     (nvgl_blend_eqn(cso->rgb_func)));
+	struct nv30_context *nv30 = nv30_context(pipe);
+	struct nouveau_grobj *rankine = nv30->screen->rankine;
+	struct nv30_blend_state *bso = CALLOC(1, sizeof(*bso));
+	struct nouveau_stateobj *so = so_new(16, 0);
+
+	if (cso->blend_enable) {
+		so_method(so, rankine, NV34TCL_BLEND_FUNC_ENABLE, 3);
+		so_data  (so, 1);
+		so_data  (so, (nvgl_blend_func(cso->alpha_src_factor) << 16) |
+			       nvgl_blend_func(cso->rgb_src_factor));
+		so_data  (so, nvgl_blend_func(cso->alpha_dst_factor) << 16 |
+			      nvgl_blend_func(cso->rgb_dst_factor));
+		so_method(so, rankine, NV34TCL_BLEND_EQUATION, 1);
+		so_data  (so, nvgl_blend_eqn(cso->alpha_func) << 16 |
+			      nvgl_blend_eqn(cso->rgb_func));
+	} else {
+		so_method(so, rankine, NV34TCL_BLEND_FUNC_ENABLE, 1);
+		so_data  (so, 0);
+	}
 
-	cb->l_enable = cso->logicop_enable ? 1 : 0;
-	cb->l_op = nvgl_logicop_func(cso->logicop_func);
+	so_method(so, rankine, NV34TCL_COLOR_MASK, 1);
+	so_data  (so, (((cso->colormask & PIPE_MASK_A) ? (0x01 << 24) : 0) |
+		       ((cso->colormask & PIPE_MASK_R) ? (0x01 << 16) : 0) |
+		       ((cso->colormask & PIPE_MASK_G) ? (0x01 <<  8) : 0) |
+		       ((cso->colormask & PIPE_MASK_B) ? (0x01 <<  0) : 0)));
 
-	cb->c_mask = (((cso->colormask & PIPE_MASK_A) ? (0x01<<24) : 0) |
-		      ((cso->colormask & PIPE_MASK_R) ? (0x01<<16) : 0) |
-		      ((cso->colormask & PIPE_MASK_G) ? (0x01<< 8) : 0) |
-		      ((cso->colormask & PIPE_MASK_B) ? (0x01<< 0) : 0));
+	if (cso->logicop_enable) {
+		so_method(so, rankine, NV34TCL_COLOR_LOGIC_OP_ENABLE, 2);
+		so_data  (so, 1);
+		so_data  (so, nvgl_logicop_func(cso->logicop_func));
+	} else {
+		so_method(so, rankine, NV34TCL_COLOR_LOGIC_OP_ENABLE, 1);
+		so_data  (so, 0);
+	}
 
-	cb->d_enable = cso->dither ? 1 : 0;
+	so_method(so, rankine, NV34TCL_DITHER_ENABLE, 1);
+	so_data  (so, cso->dither ? 1 : 0);
 
-	return (void *)cb;
+	so_ref(so, &bso->so);
+	bso->pipe = *cso;
+	return (void *)bso;
 }
 
 static void
 nv30_blend_state_bind(struct pipe_context *pipe, void *hwcso)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	struct nv30_blend_state *cb = hwcso;
-
-	if (!hwcso) {
-		return;
-	}
-
-	BEGIN_RING(rankine, NV34TCL_DITHER_ENABLE, 1);
-	OUT_RING  (cb->d_enable);
 
-	BEGIN_RING(rankine, NV34TCL_BLEND_FUNC_ENABLE, 3);
-	OUT_RING  (cb->b_enable);
-	OUT_RING  (cb->b_srcfunc);
-	OUT_RING  (cb->b_dstfunc);
-	BEGIN_RING(rankine, NV34TCL_BLEND_EQUATION, 1);
-	OUT_RING  (cb->b_eqn);
-
-	BEGIN_RING(rankine, NV34TCL_COLOR_MASK, 1);
-	OUT_RING  (cb->c_mask);
-
-	BEGIN_RING(rankine, NV34TCL_COLOR_LOGIC_OP_ENABLE, 2);
-	OUT_RING  (cb->l_enable);
-	OUT_RING  (cb->l_op);
+	nv30->blend = hwcso;
+	nv30->dirty |= NV30_NEW_BLEND;
 }
 
 static void
 nv30_blend_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-	free(hwcso);
+	struct nv30_blend_state *bso = hwcso;
+
+	so_ref(NULL, &bso->so);
+	FREE(bso);
 }
 
 
diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index 117520dd13..8489b7b796 100644
--- a/src/gallium/drivers/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
@@ -3,20 +3,6 @@
 
 #include "pipe/p_state.h"
 
-struct nv30_blend_state {
-	uint32_t b_enable;
-	uint32_t b_srcfunc;
-	uint32_t b_dstfunc;
-	uint32_t b_eqn;
-
-	uint32_t l_enable;
-	uint32_t l_op;
-
-	uint32_t c_mask;
-
-	uint32_t d_enable;
-};
-
 struct nv30_sampler_state {
 	uint32_t fmt;
 	uint32_t wrap;
diff --git a/src/gallium/drivers/nv30/nv30_state_blend.c b/src/gallium/drivers/nv30/nv30_state_blend.c
index a1b0100472..44d43e132a 100644
--- a/src/gallium/drivers/nv30/nv30_state_blend.c
+++ b/src/gallium/drivers/nv30/nv30_state_blend.c
@@ -7,7 +7,7 @@ nv30_state_blend_validate(struct nv30_context *nv30)
 	return TRUE;
 }
 
-struct nv30_state_entry nv30_state_blend_new = {
+struct nv30_state_entry nv30_state_blend = {
 	.validate = nv30_state_blend_validate,
 	.dirty = {
 		.pipe = NV30_NEW_BLEND,
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 541ad0da3e..492f411011 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -3,6 +3,7 @@
 
 static struct nv30_state_entry *render_states[] = {
 	&nv30_state_framebuffer,
+	&nv30_state_blend,
 	&nv30_state_blend_colour,
 	NULL
 };
-- 
cgit v1.2.3


From 360f7a3e239553fc0e1aff3b38c06c2e3d0a698c Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 21:48:18 +0200
Subject: nv30: Emit rasterizer state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    |   6 +-
 src/gallium/drivers/nv30/nv30_state.c      | 177 +++++++++++++++--------------
 src/gallium/drivers/nv30/nv30_state.h      |  23 ----
 src/gallium/drivers/nv30/nv30_state_emit.c |   1 +
 4 files changed, 98 insertions(+), 109 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index eedebc91b2..692d8dd523 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -76,8 +76,7 @@ enum nv30_state_index {
 #define NV30_NEW_ARRAYS		(1 << 11)
 #define NV30_NEW_UCP		(1 << 12)
 
-/* TODO: rename when removing the old state emitter */
-struct nv30_rasterizer_state_new {
+struct nv30_rasterizer_state {
 	struct pipe_rasterizer_state pipe;
 	struct nouveau_stateobj *so;
 };
@@ -124,11 +123,11 @@ struct nv30_context {
 	unsigned vp_samplers;
 
 	/* Context state */
+	struct nv30_rasterizer_state *rasterizer;
 	struct nv30_blend_state *blend;
 	struct pipe_blend_color blend_colour;
 	struct pipe_viewport_state viewport;
 	struct pipe_framebuffer_state framebuffer;
-	struct nv30_rasterizer_state_new *rasterizer;
 	struct nv30_zsa_state *zsa;
 	unsigned stipple[32];
 
@@ -211,6 +210,7 @@ extern void nv30_fragtex_bind(struct nv30_context *);
 extern boolean nv30_state_validate(struct nv30_context *nv30);
 extern void nv30_emit_hw_state(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
+extern struct nv30_state_entry nv30_state_rasterizer;
 extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_framebuffer;
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index cf46dcef93..8c7a902e28 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -275,123 +275,134 @@ static void *
 nv30_rasterizer_state_create(struct pipe_context *pipe,
 			     const struct pipe_rasterizer_state *cso)
 {
-	struct nv30_rasterizer_state *rs;
-	int i;
+	struct nv30_context *nv30 = nv30_context(pipe);
+	struct nv30_rasterizer_state *rsso = CALLOC(1, sizeof(*rsso));
+	struct nouveau_stateobj *so = so_new(32, 0);
+	struct nouveau_grobj *rankine = nv30->screen->rankine;
 
 	/*XXX: ignored:
 	 * 	light_twoside
-	 * 	offset_cw/ccw -nohw
-	 * 	scissor
 	 * 	point_smooth -nohw
 	 * 	multisample
-	 * 	offset_units / offset_scale
 	 */
-	rs = malloc(sizeof(struct nv30_rasterizer_state));
-
-	rs->shade_model = cso->flatshade ? 0x1d00 : 0x1d01;
 
-	rs->line_width = (unsigned char)(cso->line_width * 8.0) & 0xff;
-	rs->line_smooth_en = cso->line_smooth ? 1 : 0;
-	rs->line_stipple_en = cso->line_stipple_enable ? 1 : 0;
-	rs->line_stipple = (cso->line_stipple_pattern << 16) |
-			    cso->line_stipple_factor;
+	so_method(so, rankine, NV34TCL_SHADE_MODEL, 1);
+	so_data  (so, cso->flatshade ? NV34TCL_SHADE_MODEL_FLAT :
+				       NV34TCL_SHADE_MODEL_SMOOTH);
 
-	rs->point_size = *(uint32_t*)&cso->point_size;
+	so_method(so, rankine, NV34TCL_LINE_WIDTH, 2);
+	so_data  (so, (unsigned char)(cso->line_width * 8.0) & 0xff);
+	so_data  (so, cso->line_smooth ? 1 : 0);
+	so_method(so, rankine, NV34TCL_LINE_STIPPLE_ENABLE, 2);
+	so_data  (so, cso->line_stipple_enable ? 1 : 0);
+	so_data  (so, (cso->line_stipple_pattern << 16) |
+		       cso->line_stipple_factor);
 
-	rs->poly_smooth_en = cso->poly_smooth ? 1 : 0;
-	rs->poly_stipple_en = cso->poly_stipple_enable ? 1 : 0;
+	so_method(so, rankine, NV34TCL_POINT_SIZE, 1);
+	so_data  (so, fui(cso->point_size));
 
+	so_method(so, rankine, NV34TCL_POLYGON_MODE_FRONT, 6);
 	if (cso->front_winding == PIPE_WINDING_CCW) {
-		rs->front_face = NV34TCL_FRONT_FACE_CCW;
-		rs->poly_mode_front = nvgl_polygon_mode(cso->fill_ccw);
-		rs->poly_mode_back  = nvgl_polygon_mode(cso->fill_cw);
+		so_data(so, nvgl_polygon_mode(cso->fill_ccw));
+		so_data(so, nvgl_polygon_mode(cso->fill_cw));
+		switch (cso->cull_mode) {
+		case PIPE_WINDING_CCW:
+			so_data(so, NV34TCL_CULL_FACE_FRONT);
+			break;
+		case PIPE_WINDING_CW:
+			so_data(so, NV34TCL_CULL_FACE_BACK);
+			break;
+		case PIPE_WINDING_BOTH:
+			so_data(so, NV34TCL_CULL_FACE_FRONT_AND_BACK);
+			break;
+		default:
+			so_data(so, NV34TCL_CULL_FACE_BACK);
+			break;
+		}
+		so_data(so, NV34TCL_FRONT_FACE_CCW);
 	} else {
-		rs->front_face = NV34TCL_FRONT_FACE_CW;
-		rs->poly_mode_front = nvgl_polygon_mode(cso->fill_cw);
-		rs->poly_mode_back  = nvgl_polygon_mode(cso->fill_ccw);
+		so_data(so, nvgl_polygon_mode(cso->fill_cw));
+		so_data(so, nvgl_polygon_mode(cso->fill_ccw));
+		switch (cso->cull_mode) {
+		case PIPE_WINDING_CCW:
+			so_data(so, NV34TCL_CULL_FACE_BACK);
+			break;
+		case PIPE_WINDING_CW:
+			so_data(so, NV34TCL_CULL_FACE_FRONT);
+			break;
+		case PIPE_WINDING_BOTH:
+			so_data(so, NV34TCL_CULL_FACE_FRONT_AND_BACK);
+			break;
+		default:
+			so_data(so, NV34TCL_CULL_FACE_BACK);
+			break;
+		}
+		so_data(so, NV34TCL_FRONT_FACE_CW);
 	}
-
-	switch (cso->cull_mode) {
-	case PIPE_WINDING_CCW:
-		rs->cull_face_en = 1;
-		if (cso->front_winding == PIPE_WINDING_CCW)
-			rs->cull_face    = NV34TCL_CULL_FACE_FRONT;
-		else
-			rs->cull_face    = NV34TCL_CULL_FACE_BACK;
-		break;
-	case PIPE_WINDING_CW:
-		rs->cull_face_en = 1;
-		if (cso->front_winding == PIPE_WINDING_CW)
-			rs->cull_face    = NV34TCL_CULL_FACE_FRONT;
-		else
-			rs->cull_face    = NV34TCL_CULL_FACE_BACK;
-		break;
-	case PIPE_WINDING_BOTH:
-		rs->cull_face_en = 1;
-		rs->cull_face    = NV34TCL_CULL_FACE_FRONT_AND_BACK;
-		break;
-	case PIPE_WINDING_NONE:
-	default:
-		rs->cull_face_en = 0;
-		rs->cull_face    = 0;
-		break;
+	so_data(so, cso->poly_smooth ? 1 : 0);
+	so_data(so, (cso->cull_mode != PIPE_WINDING_NONE) ? 1 : 0);
+
+	so_method(so, rankine, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
+	so_data  (so, cso->poly_stipple_enable ? 1 : 0);
+
+	so_method(so, rankine, NV34TCL_POLYGON_OFFSET_POINT_ENABLE, 3);
+	if ((cso->offset_cw && cso->fill_cw == PIPE_POLYGON_MODE_POINT) ||
+	    (cso->offset_ccw && cso->fill_ccw == PIPE_POLYGON_MODE_POINT))
+		so_data(so, 1);
+	else
+		so_data(so, 0);
+	if ((cso->offset_cw && cso->fill_cw == PIPE_POLYGON_MODE_LINE) ||
+	    (cso->offset_ccw && cso->fill_ccw == PIPE_POLYGON_MODE_LINE))
+		so_data(so, 1);
+	else
+		so_data(so, 0);
+	if ((cso->offset_cw && cso->fill_cw == PIPE_POLYGON_MODE_FILL) ||
+	    (cso->offset_ccw && cso->fill_ccw == PIPE_POLYGON_MODE_FILL))
+		so_data(so, 1);
+	else
+		so_data(so, 0);
+	if (cso->offset_cw || cso->offset_ccw) {
+		so_method(so, rankine, NV34TCL_POLYGON_OFFSET_FACTOR, 2);
+		so_data  (so, fui(cso->offset_scale));
+		so_data  (so, fui(cso->offset_units * 2));
 	}
 
+	so_method(so, rankine, NV34TCL_POINT_SPRITE, 1);
 	if (cso->point_sprite) {
-		rs->point_sprite = (1 << 0);
+		unsigned psctl = (1 << 0), i;
+
 		for (i = 0; i < 8; i++) {
 			if (cso->sprite_coord_mode[i] != PIPE_SPRITE_COORD_NONE)
-				rs->point_sprite |= (1 << (8 + i));
+				psctl |= (1 << (8 + i));
 		}
+
+		so_data(so, psctl);
 	} else {
-		rs->point_sprite = 0;
+		so_data(so, 0);
 	}
 
-	return (void *)rs;
+	so_ref(so, &rsso->so);
+	rsso->pipe = *cso;
+	return (void *)rsso;
 }
 
 static void
 nv30_rasterizer_state_bind(struct pipe_context *pipe, void *hwcso)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	struct nv30_rasterizer_state *rs = hwcso;
 
-	if (!hwcso) {
-		return;
-	}
-
-	BEGIN_RING(rankine, NV34TCL_SHADE_MODEL, 1);
-	OUT_RING  (rs->shade_model);
-
-	BEGIN_RING(rankine, NV34TCL_LINE_WIDTH, 2);
-	OUT_RING  (rs->line_width);
-	OUT_RING  (rs->line_smooth_en);
-	BEGIN_RING(rankine, NV34TCL_LINE_STIPPLE_ENABLE, 2);
-	OUT_RING  (rs->line_stipple_en);
-	OUT_RING  (rs->line_stipple);
-
-	BEGIN_RING(rankine, NV34TCL_POINT_SIZE, 1);
-	OUT_RING  (rs->point_size);
-
-	BEGIN_RING(rankine, NV34TCL_POLYGON_MODE_FRONT, 6);
-	OUT_RING  (rs->poly_mode_front);
-	OUT_RING  (rs->poly_mode_back);
-	OUT_RING  (rs->cull_face);
-	OUT_RING  (rs->front_face);
-	OUT_RING  (rs->poly_smooth_en);
-	OUT_RING  (rs->cull_face_en);
-
-	BEGIN_RING(rankine, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
-	OUT_RING  (rs->poly_stipple_en);
-
-	BEGIN_RING(rankine, NV34TCL_POINT_SPRITE, 1);
-	OUT_RING  (rs->point_sprite);
+	nv30->rasterizer = hwcso;
+	nv30->dirty |= NV30_NEW_RAST;
+	/*nv30->draw_dirty |= NV30_NEW_RAST;*/
 }
 
 static void
 nv30_rasterizer_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-	free(hwcso);
+	struct nv30_rasterizer_state *rsso = hwcso;
+
+	so_ref(NULL, &rsso->so);
+	FREE(rsso);
 }
 
 static void
diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index 8489b7b796..b33075aceb 100644
--- a/src/gallium/drivers/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
@@ -11,29 +11,6 @@ struct nv30_sampler_state {
 	uint32_t bcol;
 };
 
-struct nv30_rasterizer_state {
-	uint32_t shade_model;
-
-	uint32_t line_width;
-	uint32_t line_smooth_en;
-	uint32_t line_stipple_en;
-	uint32_t line_stipple;
-
-	uint32_t point_size;
-
-	uint32_t poly_smooth_en;
-	uint32_t poly_stipple_en;
-	
-	uint32_t poly_mode_front;
-	uint32_t poly_mode_back;
-
-	uint32_t front_face;
-	uint32_t cull_face;
-	uint32_t cull_face_en;
-
-	uint32_t point_sprite;
-};
-
 struct nv30_vertex_program_exec {
 	uint32_t data[4];
 	boolean has_branch_offset;
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 492f411011..7d77adbfdf 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -3,6 +3,7 @@
 
 static struct nv30_state_entry *render_states[] = {
 	&nv30_state_framebuffer,
+	&nv30_state_rasterizer,
 	&nv30_state_blend,
 	&nv30_state_blend_colour,
 	NULL
-- 
cgit v1.2.3


From c66f376e271427799f777c39bc9221df7c961f77 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 22:10:53 +0200
Subject: nv30: Emit depth/stencil/alpha state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    |  1 +
 src/gallium/drivers/nv30/nv30_state.c      | 91 +++++++++++++++++-------------
 src/gallium/drivers/nv30/nv30_state.h      | 30 ----------
 src/gallium/drivers/nv30/nv30_state_emit.c |  1 +
 4 files changed, 53 insertions(+), 70 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 692d8dd523..b8a26712a8 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -213,6 +213,7 @@ extern void nv30_state_tex_update(struct nv30_context *nv30);
 extern struct nv30_state_entry nv30_state_rasterizer;
 extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
+extern struct nv30_state_entry nv30_state_zsa;
 extern struct nv30_state_entry nv30_state_framebuffer;
 
 /* nv30_vbo.c */
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 8c7a902e28..8121e62fb9 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -405,65 +405,76 @@ nv30_rasterizer_state_delete(struct pipe_context *pipe, void *hwcso)
 	FREE(rsso);
 }
 
-static void
-nv30_translate_stencil(const struct pipe_depth_stencil_alpha_state *cso,
-		       unsigned idx, struct nv30_stencil_push *hw)
-{
-	hw->enable = cso->stencil[idx].enabled ? 1 : 0;
-	hw->wmask = cso->stencil[idx].write_mask;
-	hw->func = nvgl_comparison_op(cso->stencil[idx].func);
-	hw->ref	= cso->stencil[idx].ref_value;
-	hw->vmask = cso->stencil[idx].value_mask;
-	hw->fail = nvgl_stencil_op(cso->stencil[idx].fail_op);
-	hw->zfail = nvgl_stencil_op(cso->stencil[idx].zfail_op);
-	hw->zpass = nvgl_stencil_op(cso->stencil[idx].zpass_op);
-}
-
 static void *
 nv30_depth_stencil_alpha_state_create(struct pipe_context *pipe,
 			const struct pipe_depth_stencil_alpha_state *cso)
 {
-	struct nv30_depth_stencil_alpha_state *hw;
-
-	hw = malloc(sizeof(struct nv30_depth_stencil_alpha_state));
-
-	hw->depth.func		= nvgl_comparison_op(cso->depth.func);
-	hw->depth.write_enable	= cso->depth.writemask ? 1 : 0;
-	hw->depth.test_enable	= cso->depth.enabled ? 1 : 0;
+	struct nv30_context *nv30 = nv30_context(pipe);
+	struct nv30_zsa_state *zsaso = CALLOC(1, sizeof(*zsaso));
+	struct nouveau_stateobj *so = so_new(32, 0);
+	struct nouveau_grobj *rankine = nv30->screen->rankine;
 
-	nv30_translate_stencil(cso, 0, &hw->stencil.front);
-	nv30_translate_stencil(cso, 1, &hw->stencil.back);
+	so_method(so, rankine, NV34TCL_DEPTH_FUNC, 3);
+	so_data  (so, nvgl_comparison_op(cso->depth.func));
+	so_data  (so, cso->depth.writemask ? 1 : 0);
+	so_data  (so, cso->depth.enabled ? 1 : 0);
+
+	so_method(so, rankine, NV34TCL_ALPHA_FUNC_ENABLE, 3);
+	so_data  (so, cso->alpha.enabled ? 1 : 0);
+	so_data  (so, nvgl_comparison_op(cso->alpha.func));
+	so_data  (so, float_to_ubyte(cso->alpha.ref));
+
+	if (cso->stencil[0].enabled) {
+		so_method(so, rankine, NV34TCL_STENCIL_FRONT_ENABLE, 8);
+		so_data  (so, cso->stencil[0].enabled ? 1 : 0);
+		so_data  (so, cso->stencil[0].write_mask);
+		so_data  (so, nvgl_comparison_op(cso->stencil[0].func));
+		so_data  (so, cso->stencil[0].ref_value);
+		so_data  (so, cso->stencil[0].value_mask);
+		so_data  (so, nvgl_stencil_op(cso->stencil[0].fail_op));
+		so_data  (so, nvgl_stencil_op(cso->stencil[0].zfail_op));
+		so_data  (so, nvgl_stencil_op(cso->stencil[0].zpass_op));
+	} else {
+		so_method(so, rankine, NV34TCL_STENCIL_FRONT_ENABLE, 1);
+		so_data  (so, 0);
+	}
 
-	hw->alpha.enabled = cso->alpha.enabled ? 1 : 0;
-	hw->alpha.func = nvgl_comparison_op(cso->alpha.func);
-	hw->alpha.ref  = float_to_ubyte(cso->alpha.ref);
+	if (cso->stencil[1].enabled) {
+		so_method(so, rankine, NV34TCL_STENCIL_BACK_ENABLE, 8);
+		so_data  (so, cso->stencil[1].enabled ? 1 : 0);
+		so_data  (so, cso->stencil[1].write_mask);
+		so_data  (so, nvgl_comparison_op(cso->stencil[1].func));
+		so_data  (so, cso->stencil[1].ref_value);
+		so_data  (so, cso->stencil[1].value_mask);
+		so_data  (so, nvgl_stencil_op(cso->stencil[1].fail_op));
+		so_data  (so, nvgl_stencil_op(cso->stencil[1].zfail_op));
+		so_data  (so, nvgl_stencil_op(cso->stencil[1].zpass_op));
+	} else {
+		so_method(so, rankine, NV34TCL_STENCIL_BACK_ENABLE, 1);
+		so_data  (so, 0);
+	}
 
-	return (void *)hw;
+	so_ref(so, &zsaso->so);
+	zsaso->pipe = *cso;
+	return (void *)zsaso;
 }
 
 static void
 nv30_depth_stencil_alpha_state_bind(struct pipe_context *pipe, void *hwcso)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	struct nv30_depth_stencil_alpha_state *hw = hwcso;
-
-	if (!hwcso) {
-		return;
-	}
 
-	BEGIN_RING(rankine, NV34TCL_DEPTH_FUNC, 3);
-	OUT_RINGp ((uint32_t *)&hw->depth, 3);
-	BEGIN_RING(rankine, NV34TCL_STENCIL_BACK_ENABLE, 16);
-	OUT_RINGp ((uint32_t *)&hw->stencil.back, 8);
-	OUT_RINGp ((uint32_t *)&hw->stencil.front, 8);
-	BEGIN_RING(rankine, NV34TCL_ALPHA_FUNC_ENABLE, 3);
-	OUT_RINGp ((uint32_t *)&hw->alpha.enabled, 3);
+	nv30->zsa = hwcso;
+	nv30->dirty |= NV30_NEW_ZSA;
 }
 
 static void
 nv30_depth_stencil_alpha_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-	free(hwcso);
+	struct nv30_zsa_state *zsaso = hwcso;
+
+	so_ref(NULL, &zsaso->so);
+	FREE(zsaso);
 }
 
 static void *
diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index b33075aceb..c65a937467 100644
--- a/src/gallium/drivers/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
@@ -65,36 +65,6 @@ struct nv30_fragment_program {
 	uint32_t fp_reg_control;
 };
 
-struct nv30_stencil_push {
-	uint32_t enable;
-	uint32_t wmask;
-	uint32_t func;
-	uint32_t ref;
-	uint32_t vmask;
-	uint32_t fail;
-	uint32_t zfail;
-	uint32_t zpass;
-};
-
-struct nv30_depth_stencil_alpha_state {
-	struct {
-		uint32_t func;
-		uint32_t write_enable;
-		uint32_t test_enable;
-	} depth;
-
-	struct {
-		struct nv30_stencil_push back;
-		struct nv30_stencil_push front;
-	} stencil;
-
-	struct {
-		uint32_t enabled;
-		uint32_t func;
-		uint32_t ref;
-	} alpha;
-};
-
 struct nv30_miptree {
 	struct pipe_texture base;
 
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 7d77adbfdf..83bb3408a5 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -6,6 +6,7 @@ static struct nv30_state_entry *render_states[] = {
 	&nv30_state_rasterizer,
 	&nv30_state_blend,
 	&nv30_state_blend_colour,
+	&nv30_state_zsa,
 	NULL
 };
 
-- 
cgit v1.2.3


From f1d24c1d27255e4ff5ba451e6d58558f9ccdc801 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 22:18:38 +0200
Subject: nv30: Emit scissor state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    | 1 +
 src/gallium/drivers/nv30/nv30_state.c      | 5 ++---
 src/gallium/drivers/nv30/nv30_state_emit.c | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index b8a26712a8..2a48903e32 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -211,6 +211,7 @@ extern boolean nv30_state_validate(struct nv30_context *nv30);
 extern void nv30_emit_hw_state(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
 extern struct nv30_state_entry nv30_state_rasterizer;
+extern struct nv30_state_entry nv30_state_scissor;
 extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_zsa;
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 8121e62fb9..f2413a3372 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -607,9 +607,8 @@ nv30_set_scissor_state(struct pipe_context *pipe,
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 
-	BEGIN_RING(rankine, NV34TCL_SCISSOR_HORIZ, 2);
-	OUT_RING  (((s->maxx - s->minx) << 16) | s->minx);
-	OUT_RING  (((s->maxy - s->miny) << 16) | s->miny);
+	nv30->scissor = *s;
+	nv30->dirty |= NV30_NEW_SCISSOR;
 }
 
 static void
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 83bb3408a5..f45a340b5d 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -4,6 +4,7 @@
 static struct nv30_state_entry *render_states[] = {
 	&nv30_state_framebuffer,
 	&nv30_state_rasterizer,
+	&nv30_state_scissor,
 	&nv30_state_blend,
 	&nv30_state_blend_colour,
 	&nv30_state_zsa,
-- 
cgit v1.2.3


From e7e231a5116aed9f1ca685a297032a3e3e6a2433 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 22:31:23 +0200
Subject: nv30: Emit polygon stipple state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    | 10 +++++-----
 src/gallium/drivers/nv30/nv30_state.c      |  4 ++--
 src/gallium/drivers/nv30/nv30_state_emit.c |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 2a48903e32..ed7b0759ad 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -112,9 +112,6 @@ struct nv30_context {
 
 	/* HW state derived from pipe states */
 	struct nv30_state state;
-	struct pipe_scissor_state scissor;
-
-	uint32_t dirty;
 
 	struct nv30_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
 	struct nv30_miptree *tex_miptree[PIPE_MAX_SAMPLERS];
@@ -123,13 +120,15 @@ struct nv30_context {
 	unsigned vp_samplers;
 
 	/* Context state */
+	unsigned dirty;
+	struct pipe_scissor_state scissor;
+	unsigned stipple[32];
 	struct nv30_rasterizer_state *rasterizer;
+	struct nv30_zsa_state *zsa;
 	struct nv30_blend_state *blend;
 	struct pipe_blend_color blend_colour;
 	struct pipe_viewport_state viewport;
 	struct pipe_framebuffer_state framebuffer;
-	struct nv30_zsa_state *zsa;
-	unsigned stipple[32];
 
 	uint32_t rt_enable;
 	struct pipe_buffer *rt[2];
@@ -212,6 +211,7 @@ extern void nv30_emit_hw_state(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
 extern struct nv30_state_entry nv30_state_rasterizer;
 extern struct nv30_state_entry nv30_state_scissor;
+extern struct nv30_state_entry nv30_state_stipple;
 extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_zsa;
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index f2413a3372..7109deae55 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -597,8 +597,8 @@ nv30_set_polygon_stipple(struct pipe_context *pipe,
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 
-	BEGIN_RING(rankine, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
-	OUT_RINGp ((uint32_t *)stipple->stipple, 32);
+	memcpy(nv30->stipple, stipple->stipple, 4 * 32);
+	nv30->dirty |= NV30_NEW_STIPPLE;
 }
 
 static void
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index f45a340b5d..4f9079184d 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -5,6 +5,7 @@ static struct nv30_state_entry *render_states[] = {
 	&nv30_state_framebuffer,
 	&nv30_state_rasterizer,
 	&nv30_state_scissor,
+	&nv30_state_stipple,
 	&nv30_state_blend,
 	&nv30_state_blend_colour,
 	&nv30_state_zsa,
-- 
cgit v1.2.3


From 568b477b9c118e5ace831b8ecf1811da1c0961cd Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 22:42:30 +0200
Subject: nv30: Emit viewport state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    |  1 +
 src/gallium/drivers/nv30/nv30_state.c      | 12 +++---------
 src/gallium/drivers/nv30/nv30_state_emit.c |  1 +
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index ed7b0759ad..0ad1dc6f91 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -215,6 +215,7 @@ extern struct nv30_state_entry nv30_state_stipple;
 extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_zsa;
+extern struct nv30_state_entry nv30_state_viewport;
 extern struct nv30_state_entry nv30_state_framebuffer;
 
 /* nv30_vbo.c */
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 7109deae55..e65c4b215d 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -617,15 +617,9 @@ nv30_set_viewport_state(struct pipe_context *pipe,
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 
-	BEGIN_RING(rankine, NV34TCL_VIEWPORT_TRANSLATE_X, 8);
-	OUT_RINGf (vpt->translate[0]);
-	OUT_RINGf (vpt->translate[1]);
-	OUT_RINGf (vpt->translate[2]);
-	OUT_RINGf (vpt->translate[3]);
-	OUT_RINGf (vpt->scale[0]);
-	OUT_RINGf (vpt->scale[1]);
-	OUT_RINGf (vpt->scale[2]);
-	OUT_RINGf (vpt->scale[3]);
+	nv30->viewport = *vpt;
+	nv30->dirty |= NV30_NEW_VIEWPORT;
+	/*nv30->draw_dirty |= NV30_NEW_VIEWPORT;*/
 }
 
 static void
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 4f9079184d..cb7f1a7c31 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -9,6 +9,7 @@ static struct nv30_state_entry *render_states[] = {
 	&nv30_state_blend,
 	&nv30_state_blend_colour,
 	&nv30_state_zsa,
+	&nv30_state_viewport,
 	NULL
 };
 
-- 
cgit v1.2.3


From 6f56b527d866506a323feb19f9d8529d40034af2 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Thu, 3 Jul 2008 22:47:15 +0200
Subject: nv30: Reemit state when changing context

---
 src/gallium/drivers/nv30/nv30_state_emit.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index cb7f1a7c31..eca1f0652c 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -46,9 +46,19 @@ void
 nv30_emit_hw_state(struct nv30_context *nv30)
 {
 	struct nv30_state *state = &nv30->state;
+	struct nv30_screen *screen = nv30->screen;
 	unsigned i;
 	uint64 states;
 
+	if (nv30->pctx_id != screen->cur_pctx) {
+		for (i = 0; i < NV30_STATE_MAX; i++) {
+			if (state->hw[i] && screen->state[i] != state->hw[i])
+				state->dirty |= (1ULL << i);
+		}
+
+		screen->cur_pctx = nv30->pctx_id;
+	}
+
 	for (i = 0, states = state->dirty; states; i++) {
 		if (!(states & (1ULL << i)))
 			continue;
-- 
cgit v1.2.3


From f99643ca6ea3aa05a0b16dc5d99e11fa00185684 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Fri, 4 Jul 2008 18:53:44 +0200
Subject: nv30: Emit sampler state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    |  3 +++
 src/gallium/drivers/nv30/nv30_state.c      | 42 +++++++++++++++++++++++++-----
 src/gallium/drivers/nv30/nv30_state_emit.c |  9 ++++++-
 3 files changed, 46 insertions(+), 8 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 0ad1dc6f91..5404685da2 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -96,6 +96,7 @@ struct nv30_state {
 	unsigned scissor_enabled;
 	unsigned stipple_enabled;
 	unsigned viewport_bypass;
+	unsigned fp_samplers;
 
 	uint64_t dirty;
 	struct nouveau_stateobj *hw[NV30_STATE_MAX];
@@ -129,6 +130,8 @@ struct nv30_context {
 	struct pipe_blend_color blend_colour;
 	struct pipe_viewport_state viewport;
 	struct pipe_framebuffer_state framebuffer;
+	unsigned nr_samplers;
+	unsigned nr_textures;
 
 	uint32_t rt_enable;
 	struct pipe_buffer *rt[2];
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index e65c4b215d..97becd2be3 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -1,6 +1,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_util.h"
+#include "pipe/p_inlines.h"
 
 #include "nv30_context.h"
 #include "nv30_state.h"
@@ -116,7 +117,7 @@ nv30_sampler_state_create(struct pipe_context *pipe,
 	struct nv30_sampler_state *ps;
 	uint32_t filter = 0;
 
-	ps = malloc(sizeof(struct nv30_sampler_state));
+	ps = MALLOC(sizeof(struct nv30_sampler_state));
 
 	ps->fmt = 0;
 	if (!cso->normalized_coords)
@@ -197,6 +198,19 @@ nv30_sampler_state_create(struct pipe_context *pipe,
 
 	ps->filt = filter;
 
+	/*{
+		float limit;
+
+		limit = CLAMP(cso->lod_bias, -16.0, 15.0);
+		ps->filt |= (int)(cso->lod_bias * 256.0) & 0x1fff;
+
+		limit = CLAMP(cso->max_lod, 0.0, 15.0);
+		ps->en |= (int)(limit * 256.0) << 7;
+
+		limit = CLAMP(cso->min_lod, 0.0, 15.0);
+		ps->en |= (int)(limit * 256.0) << 19;
+	}*/
+
 /*	if (cso->compare_mode == PIPE_TEX_COMPARE_R_TO_TEXTURE) {
 		switch (cso->compare_func) {
 		case PIPE_FUNC_NEVER:
@@ -242,20 +256,24 @@ nv30_sampler_state_bind(struct pipe_context *pipe, unsigned nr, void **sampler)
 	struct nv30_context *nv30 = nv30_context(pipe);
 	unsigned unit;
 
-	if (!sampler) {
-		return;
-	}
-
 	for (unit = 0; unit < nr; unit++) {
 		nv30->tex_sampler[unit] = sampler[unit];
 		nv30->dirty_samplers |= (1 << unit);
 	}
+
+	for (unit = nr; unit < nv30->nr_samplers; unit++) {
+		nv30->tex_sampler[unit] = NULL;
+		nv30->dirty_samplers |= (1 << unit);
+	}
+
+	nv30->nr_samplers = nr;
+	nv30->dirty |= NV30_NEW_SAMPLER;
 }
 
 static void
 nv30_sampler_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-	free(hwcso);
+	FREE(hwcso);
 }
 
 static void
@@ -266,9 +284,19 @@ nv30_set_sampler_texture(struct pipe_context *pipe, unsigned nr,
 	unsigned unit;
 
 	for (unit = 0; unit < nr; unit++) {
-		nv30->tex_miptree[unit] = (struct nv30_miptree *)miptree[unit];
+		pipe_texture_reference((struct pipe_texture **)
+				       &nv30->tex_miptree[unit], miptree[unit]);
 		nv30->dirty_samplers |= (1 << unit);
 	}
+
+	for (unit = nr; unit < nv30->nr_textures; unit++) {
+		pipe_texture_reference((struct pipe_texture **)
+				       &nv30->tex_miptree[unit], NULL);
+		nv30->dirty_samplers |= (1 << unit);
+	}
+
+	nv30->nr_textures = nr;
+	nv30->dirty |= NV30_NEW_SAMPLER;
 }
 
 static void *
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index eca1f0652c..0ea7857197 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -47,7 +47,7 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 {
 	struct nv30_state *state = &nv30->state;
 	struct nv30_screen *screen = nv30->screen;
-	unsigned i;
+	unsigned i, samplers;
 	uint64 states;
 
 	if (nv30->pctx_id != screen->cur_pctx) {
@@ -91,6 +91,13 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 	nv30->dirty_samplers = 0;
 
 	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
+	for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
+		if (!(samplers & (1 << i)))
+			continue;
+		so_emit_reloc_markers(nv30->nvws,
+				      state->hw[NV30_STATE_FRAGTEX0+i]);
+		samplers &= ~(1ULL << i);
+	}
 
 	/* Texture images, emitted in nv30_fragtex_build */
 #if 0
-- 
cgit v1.2.3


From 5acbd0b0961089f9553adbe9b3d1341997ccb220 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Fri, 11 Jul 2008 22:42:42 +0200
Subject: nv30: Emit fragtex state using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    |  1 +
 src/gallium/drivers/nv30/nv30_fragtex.c    | 82 +++++++++++++++++++-----------
 src/gallium/drivers/nv30/nv30_state_emit.c | 38 +++-----------
 3 files changed, 59 insertions(+), 62 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 5404685da2..72f803c80a 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -220,6 +220,7 @@ extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_zsa;
 extern struct nv30_state_entry nv30_state_viewport;
 extern struct nv30_state_entry nv30_state_framebuffer;
+extern struct nv30_state_entry nv30_state_fragtex;
 
 /* nv30_vbo.c */
 extern boolean nv30_draw_arrays(struct pipe_context *, unsigned mode,
diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c b/src/gallium/drivers/nv30/nv30_fragtex.c
index f253087c88..abe77b51df 100644
--- a/src/gallium/drivers/nv30/nv30_fragtex.c
+++ b/src/gallium/drivers/nv30/nv30_fragtex.c
@@ -49,17 +49,17 @@ nv30_texture_formats[] = {
 	_(A8R8G8B8_UNORM, A8R8G8B8,   S1,   S1,   S1,   S1, X, Y, Z, W),
 	_(A1R5G5B5_UNORM, A1R5G5B5,   S1,   S1,   S1,   S1, X, Y, Z, W),
 	_(A4R4G4B4_UNORM, A4R4G4B4,   S1,   S1,   S1,   S1, X, Y, Z, W),
-//	_(R5G6B5_UNORM  , R5G6B5  ,   S1,   S1,   S1,  ONE, X, Y, Z, W),
+	_(R5G6B5_UNORM  , R5G6B5  ,   S1,   S1,   S1,  ONE, X, Y, Z, W),
 	_(L8_UNORM      , L8      ,   S1,   S1,   S1,  ONE, X, X, X, X),
 	_(A8_UNORM      , L8      , ZERO, ZERO, ZERO,   S1, X, X, X, X),
 	_(I8_UNORM      , L8      ,   S1,   S1,   S1,   S1, X, X, X, X),
 	_(A8L8_UNORM    , A8L8    ,   S1,   S1,   S1,   S1, X, X, X, Y),
 //	_(Z16_UNORM     , Z16     ,   S1,   S1,   S1,  ONE, X, X, X, X),
 //	_(Z24S8_UNORM   , Z24     ,   S1,   S1,   S1,  ONE, X, X, X, X),
-//	_(RGB_DXT1      , 0x86,   S1,   S1,   S1,  ONE, X, Y, Z, W, 0x00, 0x00),
-//	_(RGBA_DXT1     , 0x86,   S1,   S1,   S1,   S1, X, Y, Z, W, 0x00, 0x00),
-//	_(RGBA_DXT3     , 0x87,   S1,   S1,   S1,   S1, X, Y, Z, W, 0x00, 0x00),
-//	_(RGBA_DXT5     , 0x88,   S1,   S1,   S1,   S1, X, Y, Z, W, 0x00, 0x00),
+	_(DXT1_RGB      , DXT1    ,   S1,   S1,   S1,  ONE, X, Y, Z, W),
+	_(DXT1_RGBA     , DXT1    ,   S1,   S1,   S1,   S1, X, Y, Z, W),
+	_(DXT3_RGBA     , DXT3    ,   S1,   S1,   S1,   S1, X, Y, Z, W),
+	_(DXT5_RGBA     , DXT5    ,   S1,   S1,   S1,   S1, X, Y, Z, W),
 	{},
 };
 
@@ -67,6 +67,7 @@ static struct nv30_texture_format *
 nv30_fragtex_format(uint pipe_format)
 {
 	struct nv30_texture_format *tf = nv30_texture_formats;
+	char fs[128];
 
 	while (tf->defined) {
 		if (tf->pipe == pipe_format)
@@ -74,26 +75,27 @@ nv30_fragtex_format(uint pipe_format)
 		tf++;
 	}
 
+	pf_sprint_name(fs, pipe_format);
+	NOUVEAU_ERR("unknown texture format %s\n", fs);
 	return NULL;
 }
 
 
-static void
+static struct nouveau_stateobj *
 nv30_fragtex_build(struct nv30_context *nv30, int unit)
 {
 	struct nv30_sampler_state *ps = nv30->tex_sampler[unit];
 	struct nv30_miptree *nv30mt = nv30->tex_miptree[unit];
 	struct pipe_texture *pt = &nv30mt->base;
 	struct nv30_texture_format *tf;
-	uint32_t txf, txs, txp;
-	int swizzled = 0; /*XXX: implement in region code? */
+	struct nouveau_stateobj *so;
+	uint32_t txf, txs /*, txp*/;
+	/*int swizzled = 0;*/ /*XXX: implement in region code? */
 	unsigned tex_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD;
 
 	tf = nv30_fragtex_format(pt->format);
-	if (!tf || !tf->defined) {
-		NOUVEAU_ERR("Unsupported texture format: 0x%x\n", pt->format);
-		return;
-	}
+	if (!tf)
+		assert(0);
 
 	txf  = tf->format << 8;
 	txf |= ((pt->last_level>0) ? NV34TCL_TX_FORMAT_MIPMAP : 0);
@@ -117,35 +119,45 @@ nv30_fragtex_build(struct nv30_context *nv30, int unit)
 		break;
 	default:
 		NOUVEAU_ERR("Unknown target %d\n", pt->target);
-		return;
+		return NULL;
 	}
 
 	txs = tf->swizzle;
 
-	BEGIN_RING(rankine, NV34TCL_TX_OFFSET(unit), 8);
-	OUT_RELOCl(nv30mt->buffer, 0, tex_flags | NOUVEAU_BO_LOW);
-	OUT_RELOCd(nv30mt->buffer,txf, tex_flags | NOUVEAU_BO_RD, 1/*VRAM*/,2/*TT*/);
-	OUT_RING  (ps->wrap);
-	OUT_RING  (NV34TCL_TX_ENABLE_ENABLE | ps->en);
-	OUT_RING  (txs);
-	OUT_RING  (ps->filt | 0x2000 /* magic */);
-	OUT_RING  ((pt->width[0] << NV34TCL_TX_NPOT_SIZE_W_SHIFT) | pt->height[0]);
-	OUT_RING  (ps->bcol);
+	so = so_new(16, 2);
+	so_method(so, nv30->screen->rankine, NV34TCL_TX_OFFSET(unit), 8);
+	so_reloc (so, nv30mt->buffer, 0, tex_flags | NOUVEAU_BO_LOW, 0, 0);
+	so_reloc (so, nv30mt->buffer, txf, tex_flags | NOUVEAU_BO_OR,
+		  NV34TCL_TX_FORMAT_DMA0, NV34TCL_TX_FORMAT_DMA1);
+	so_data  (so, ps->wrap);
+	so_data  (so, NV34TCL_TX_ENABLE_ENABLE | ps->en);
+	so_data  (so, txs);
+	so_data  (so, ps->filt | 0x2000 /*voodoo*/);
+	so_data  (so, (pt->width[0] << NV34TCL_TX_NPOT_SIZE_W_SHIFT) |
+		       pt->height[0]);
+	so_data  (so, ps->bcol);
+
+	return so;
 }
 
-void
-nv30_fragtex_bind(struct nv30_context *nv30)
+static boolean
+nv30_fragtex_validate(struct nv30_context *nv30)
 {
-	struct nv30_fragment_program *fp = nv30->fragprog.active;
+	struct nv30_fragment_program *fp = nv30->fragprog.current;
+	struct nv30_state *state = &nv30->state;
+	struct nouveau_stateobj *so;
 	unsigned samplers, unit;
 
-	samplers = nv30->fp_samplers & ~fp->samplers;
+	samplers = state->fp_samplers & ~fp->samplers;
 	while (samplers) {
 		unit = ffs(samplers) - 1;
 		samplers &= ~(1 << unit);
 
-		BEGIN_RING(rankine, NV34TCL_TX_ENABLE(unit), 1);
-		OUT_RING  (0);
+		so = so_new(2, 0);
+		so_method(so, nv30->screen->rankine, NV34TCL_TX_ENABLE(unit), 1);
+		so_data  (so, 0);
+		so_ref(so, &nv30->state.hw[NV30_STATE_FRAGTEX0 + unit]);
+		state->dirty |= (1ULL << (NV30_STATE_FRAGTEX0 + unit));
 	}
 
 	samplers = nv30->dirty_samplers & fp->samplers;
@@ -153,9 +165,19 @@ nv30_fragtex_bind(struct nv30_context *nv30)
 		unit = ffs(samplers) - 1;
 		samplers &= ~(1 << unit);
 
-		nv30_fragtex_build(nv30, unit);
+		so = nv30_fragtex_build(nv30, unit);
+		so_ref(so, &nv30->state.hw[NV30_STATE_FRAGTEX0 + unit]);
+		state->dirty |= (1ULL << (NV30_STATE_FRAGTEX0 + unit));
 	}
 
-	nv30->fp_samplers = fp->samplers;
+	nv30->state.fp_samplers = fp->samplers;
+	return FALSE;
 }
 
+struct nv30_state_entry nv30_state_fragtex = {
+	.validate = nv30_fragtex_validate,
+	.dirty = {
+		.pipe = NV30_NEW_SAMPLER | NV30_NEW_FRAGPROG,
+		.hw = 0
+	}
+};
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 0ea7857197..cf10ddd4b6 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -6,6 +6,7 @@ static struct nv30_state_entry *render_states[] = {
 	&nv30_state_rasterizer,
 	&nv30_state_scissor,
 	&nv30_state_stipple,
+	&nv30_state_fragtex,
 	&nv30_state_blend,
 	&nv30_state_blend_colour,
 	&nv30_state_zsa,
@@ -59,6 +60,11 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 		screen->cur_pctx = nv30->pctx_id;
 	}
 
+	if (nv30->dirty & NV30_NEW_FRAGPROG) {
+		nv30_fragprog_bind(nv30, nv30->fragprog.current);
+		/*XXX: clear NV30_NEW_FRAGPROG if no new program uploaded */
+	}
+
 	for (i = 0, states = state->dirty; states; i++) {
 		if (!(states & (1ULL << i)))
 			continue;
@@ -68,28 +74,11 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 		states &= ~(1ULL << i);
 	}
 
-	if (nv30->dirty & NV30_NEW_FRAGPROG) {
-		nv30_fragprog_bind(nv30, nv30->fragprog.current);
-		/*XXX: clear NV30_NEW_FRAGPROG if no new program uploaded */
-	}
-
-	if (nv30->dirty_samplers || (nv30->dirty & NV30_NEW_FRAGPROG)) {
-		nv30_fragtex_bind(nv30);
-/*
-		BEGIN_RING(rankine, NV34TCL_TX_CACHE_CTL, 1);
-		OUT_RING  (2);
-		BEGIN_RING(rankine, NV34TCL_TX_CACHE_CTL, 1);
-		OUT_RING  (1);*/
-		nv30->dirty &= ~NV30_NEW_FRAGPROG;
-	}
-
 	if (nv30->dirty & NV30_NEW_VERTPROG) {
 		nv30_vertprog_bind(nv30, nv30->vertprog.current);
 		nv30->dirty &= ~NV30_NEW_VERTPROG;
 	}
 
-	nv30->dirty_samplers = 0;
-
 	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
 	for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
 		if (!(samplers & (1 << i)))
@@ -99,21 +88,6 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 		samplers &= ~(1ULL << i);
 	}
 
-	/* Texture images, emitted in nv30_fragtex_build */
-#if 0
-	for (i = 0; i < 16; i++) {
-		if (!(nv30->fp_samplers & (1 << i)))
-			continue;
-		BEGIN_RING(rankine, NV34TCL_TX_OFFSET(i), 2);
-		OUT_RELOCl(nv30->tex[i].buffer, 0, NOUVEAU_BO_VRAM |
-			   NOUVEAU_BO_GART | NOUVEAU_BO_RD);
-		OUT_RELOCd(nv30->tex[i].buffer, nv30->tex[i].format,
-			   NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD |
-			   NOUVEAU_BO_OR, NV34TCL_TX_FORMAT_DMA0,
-			   NV34TCL_TX_FORMAT_DMA1);
-	}
-#endif
-
 	/* Fragment program */
 	BEGIN_RING(rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);
 	OUT_RELOC (nv30->fragprog.active->buffer, 0, NOUVEAU_BO_VRAM |
-- 
cgit v1.2.3


From 2419a5fe3601851989506a11b0bd4e3cfb071035 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 12 Jul 2008 00:19:15 +0200
Subject: nv30: Emit vertex program using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    | 11 ++------
 src/gallium/drivers/nv30/nv30_state.c      | 11 ++++----
 src/gallium/drivers/nv30/nv30_state.h      |  2 ++
 src/gallium/drivers/nv30/nv30_state_emit.c |  6 +----
 src/gallium/drivers/nv30/nv30_vbo.c        |  2 +-
 src/gallium/drivers/nv30/nv30_vertprog.c   | 40 +++++++++++++++++++++++-------
 6 files changed, 42 insertions(+), 30 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index c3c8b73309..5d7080a555 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -124,6 +124,7 @@ struct nv30_context {
 	unsigned dirty;
 	struct pipe_scissor_state scissor;
 	unsigned stipple[32];
+	struct nv30_vertex_program *vertprog;
 	struct pipe_buffer *constbuf[PIPE_SHADER_TYPES];
 	unsigned constbuf_nr[PIPE_SHADER_TYPES];
 	struct nv30_rasterizer_state *rasterizer;
@@ -150,11 +151,6 @@ struct nv30_context {
 		unsigned delta;
 	} vb[16];
 
-	struct {
-		struct nv30_vertex_program *active;
-		struct nv30_vertex_program *current;
-	} vertprog;
-
 	struct {
 		struct nv30_fragment_program *active;
 		struct nv30_fragment_program *current;
@@ -188,10 +184,6 @@ extern void nv30_screen_init_miptree_functions(struct pipe_screen *pscreen);
 extern struct draw_stage *nv30_draw_render_stage(struct nv30_context *nv30);
 
 /* nv30_vertprog.c */
-extern void nv30_vertprog_translate(struct nv30_context *,
-				    struct nv30_vertex_program *);
-extern void nv30_vertprog_bind(struct nv30_context *,
-			       struct nv30_vertex_program *);
 extern void nv30_vertprog_destroy(struct nv30_context *,
 				  struct nv30_vertex_program *);
 
@@ -213,6 +205,7 @@ extern void nv30_state_tex_update(struct nv30_context *nv30);
 extern struct nv30_state_entry nv30_state_rasterizer;
 extern struct nv30_state_entry nv30_state_scissor;
 extern struct nv30_state_entry nv30_state_stipple;
+extern struct nv30_state_entry nv30_state_vertprog;
 extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_zsa;
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index aec6fa2b15..92695ce23c 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -499,10 +499,12 @@ static void *
 nv30_vp_state_create(struct pipe_context *pipe,
 		     const struct pipe_shader_state *cso)
 {
+	/*struct nv30_context *nv30 = nv30_context(pipe);*/
 	struct nv30_vertex_program *vp;
 
 	vp = CALLOC(1, sizeof(struct nv30_vertex_program));
 	vp->pipe = *cso;
+	/*vp->draw = draw_create_vertex_shader(nv30->draw, &vp->pipe);*/
 
 	return (void *)vp;
 }
@@ -511,14 +513,10 @@ static void
 nv30_vp_state_bind(struct pipe_context *pipe, void *hwcso)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	struct nv30_vertex_program *vp = hwcso;
-
-	if (!hwcso) {
-		return;
-	}
 
-	nv30->vertprog.current = vp;
+	nv30->vertprog = hwcso;
 	nv30->dirty |= NV30_NEW_VERTPROG;
+	/*nv30->draw_dirty |= NV30_NEW_VERTPROG;*/
 }
 
 static void
@@ -527,6 +525,7 @@ nv30_vp_state_delete(struct pipe_context *pipe, void *hwcso)
 	struct nv30_context *nv30 = nv30_context(pipe);
 	struct nv30_vertex_program *vp = hwcso;
 
+	/*draw_delete_vertex_shader(nv30->draw, vp->draw);*/
 	nv30_vertprog_destroy(nv30, vp);
 	FREE(vp);
 }
diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index c65a937467..a897bc5068 100644
--- a/src/gallium/drivers/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
@@ -26,6 +26,7 @@ struct nv30_vertex_program {
 	struct pipe_shader_state pipe;
 
 	boolean translated;
+
 	struct nv30_vertex_program_exec *insns;
 	unsigned nr_insns;
 	struct nv30_vertex_program_data *consts;
@@ -39,6 +40,7 @@ struct nv30_vertex_program {
 
 	uint32_t ir;
 	uint32_t or;
+	struct nouveau_stateobj *so;
 };
 
 struct nv30_fragment_program_data {
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index cf10ddd4b6..4ab62ddc01 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -7,6 +7,7 @@ static struct nv30_state_entry *render_states[] = {
 	&nv30_state_scissor,
 	&nv30_state_stipple,
 	&nv30_state_fragtex,
+	&nv30_state_vertprog,
 	&nv30_state_blend,
 	&nv30_state_blend_colour,
 	&nv30_state_zsa,
@@ -74,11 +75,6 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 		states &= ~(1ULL << i);
 	}
 
-	if (nv30->dirty & NV30_NEW_VERTPROG) {
-		nv30_vertprog_bind(nv30, nv30->vertprog.current);
-		nv30->dirty &= ~NV30_NEW_VERTPROG;
-	}
-
 	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
 	for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
 		if (!(samplers & (1 << i)))
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index d23164eb48..8e4ee7a874 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -100,7 +100,7 @@ nv30_vbo_static_attrib(struct nv30_context *nv30, int attrib,
 static void
 nv30_vbo_arrays_update(struct nv30_context *nv30)
 {
-	struct nv30_vertex_program *vp = nv30->vertprog.active;
+	struct nv30_vertex_program *vp = nv30->vertprog;
 	uint32_t inputs, vtxfmt[16];
 	int hw, num_hw = 0;
 
diff --git a/src/gallium/drivers/nv30/nv30_vertprog.c b/src/gallium/drivers/nv30/nv30_vertprog.c
index 90756febd2..65e0013205 100644
--- a/src/gallium/drivers/nv30/nv30_vertprog.c
+++ b/src/gallium/drivers/nv30/nv30_vertprog.c
@@ -563,7 +563,7 @@ nv30_vertprog_prepare(struct nv30_vpc *vpc)
 	return TRUE;
 }
 
-void
+static void
 nv30_vertprog_translate(struct nv30_context *nv30,
 			struct nv30_vertex_program *vp)
 {
@@ -636,27 +636,31 @@ out_err:
 	FREE(vpc);
 }
 
-void
-nv30_vertprog_bind(struct nv30_context *nv30, struct nv30_vertex_program *vp)
+static boolean
+nv30_vertprog_validate(struct nv30_context *nv30)
 { 
 	struct nouveau_winsys *nvws = nv30->nvws;
 	struct pipe_winsys *ws = nv30->pipe.winsys;
+	struct nouveau_grobj *rankine = nv30->screen->rankine;
+	struct nv30_vertex_program *vp;
 	struct pipe_buffer *constbuf;
 	boolean upload_code = FALSE, upload_data = FALSE;
 	int i;
 
+	vp = nv30->vertprog;
 	constbuf = nv30->constbuf[PIPE_SHADER_VERTEX];
 
 	/* Translate TGSI shader into hw bytecode */
 	if (!vp->translated) {
 		nv30_vertprog_translate(nv30, vp);
 		if (!vp->translated)
-			assert(0);
+			return FALSE;
 	}
 
 	/* Allocate hw vtxprog exec slots */
 	if (!vp->exec) {
 		struct nouveau_resource *heap = nv30->screen->vp_exec_heap;
+		struct nouveau_stateobj *so;
 		uint vplen = vp->nr_insns;
 
 		if (nvws->res_alloc(heap, vplen, vp, &vp->exec)) {
@@ -671,6 +675,15 @@ nv30_vertprog_bind(struct nv30_context *nv30, struct nv30_vertex_program *vp)
 				assert(0);
 		}
 
+		so = so_new(2, 0);
+		so_method(so, rankine, NV34TCL_VP_START_FROM_ID, 1);
+		so_data  (so, vp->exec->start);
+		/* Add these, and you'll go 1/3 speed */
+		/*so_method(so, rankine, NV34TCL_VP_ATTRIB_EN, 2);
+		so_data  (so, vp->ir);
+		so_data  (so, vp->or);*/
+		so_ref(so, &vp->so);
+
 		upload_code = TRUE;
 	}
 
@@ -777,10 +790,12 @@ nv30_vertprog_bind(struct nv30_context *nv30, struct nv30_vertex_program *vp)
 		}
 	}
 
-	BEGIN_RING(rankine, NV34TCL_VP_START_FROM_ID, 1);
-	OUT_RING  (vp->exec->start);
+	if (vp->so != nv30->state.hw[NV30_STATE_VERTPROG]) {
+		so_ref(vp->so, &nv30->state.hw[NV30_STATE_VERTPROG]);
+		return TRUE;
+	}
 
-	nv30->vertprog.active = vp;
+	return FALSE;
 }
 
 void
@@ -808,7 +823,14 @@ nv30_vertprog_destroy(struct nv30_context *nv30, struct nv30_vertex_program *vp)
 	vp->data_start = 0;
 	vp->data_start_min = 0;
 
-	/* vp->ir = vp->or = vp->clip_ctrl = 0;
-	so_ref(NULL, &vp->so); */
+	vp->ir = vp->or = 0;
+	so_ref(NULL, &vp->so);
 }
 
+struct nv30_state_entry nv30_state_vertprog = {
+	.validate = nv30_vertprog_validate,
+	.dirty = {
+		.pipe = NV30_NEW_VERTPROG /*| NV30_NEW_UCP*/,
+		.hw = NV30_STATE_VERTPROG,
+	}
+};
-- 
cgit v1.2.3


From 58737dc87575625438d288fe2f816b6a9d2086f1 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 12 Jul 2008 00:48:26 +0200
Subject: nv30: Emit fragment program using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    | 11 +----
 src/gallium/drivers/nv30/nv30_fragprog.c   | 65 +++++++++++++++++++++---------
 src/gallium/drivers/nv30/nv30_fragtex.c    |  2 +-
 src/gallium/drivers/nv30/nv30_state.c      |  9 ++---
 src/gallium/drivers/nv30/nv30_state.h      |  3 ++
 src/gallium/drivers/nv30/nv30_state_emit.c | 14 +------
 6 files changed, 56 insertions(+), 48 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 5d7080a555..0c900c5598 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -125,6 +125,7 @@ struct nv30_context {
 	struct pipe_scissor_state scissor;
 	unsigned stipple[32];
 	struct nv30_vertex_program *vertprog;
+	struct nv30_fragment_program *fragprog;
 	struct pipe_buffer *constbuf[PIPE_SHADER_TYPES];
 	unsigned constbuf_nr[PIPE_SHADER_TYPES];
 	struct nv30_rasterizer_state *rasterizer;
@@ -151,11 +152,6 @@ struct nv30_context {
 		unsigned delta;
 	} vb[16];
 
-	struct {
-		struct nv30_fragment_program *active;
-		struct nv30_fragment_program *current;
-	} fragprog;
-
 	struct pipe_vertex_buffer  vtxbuf[PIPE_MAX_ATTRIBS];
 	struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
 };
@@ -188,10 +184,6 @@ extern void nv30_vertprog_destroy(struct nv30_context *,
 				  struct nv30_vertex_program *);
 
 /* nv30_fragprog.c */
-extern void nv30_fragprog_translate(struct nv30_context *,
-				    struct nv30_fragment_program *);
-extern void nv30_fragprog_bind(struct nv30_context *,
-			       struct nv30_fragment_program *);
 extern void nv30_fragprog_destroy(struct nv30_context *,
 				  struct nv30_fragment_program *);
 
@@ -205,6 +197,7 @@ extern void nv30_state_tex_update(struct nv30_context *nv30);
 extern struct nv30_state_entry nv30_state_rasterizer;
 extern struct nv30_state_entry nv30_state_scissor;
 extern struct nv30_state_entry nv30_state_stipple;
+extern struct nv30_state_entry nv30_state_fragprog;
 extern struct nv30_state_entry nv30_state_vertprog;
 extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c
index b560455a02..06ed04cbfe 100644
--- a/src/gallium/drivers/nv30/nv30_fragprog.c
+++ b/src/gallium/drivers/nv30/nv30_fragprog.c
@@ -723,7 +723,7 @@ out_err:
 	return FALSE;
 }
 
-void
+static void
 nv30_fragprog_translate(struct nv30_context *nv30,
 			struct nv30_fragment_program *fp)
 {
@@ -817,23 +817,46 @@ nv30_fragprog_upload(struct nv30_context *nv30,
 	ws->buffer_unmap(ws, fp->buffer);
 }
 
-void
-nv30_fragprog_bind(struct nv30_context *nv30, struct nv30_fragment_program *fp)
+static boolean
+nv30_fragprog_validate(struct nv30_context *nv30)
 {
+	struct nv30_fragment_program *fp = nv30->fragprog;
 	struct pipe_buffer *constbuf =
 		nv30->constbuf[PIPE_SHADER_FRAGMENT];
 	struct pipe_winsys *ws = nv30->pipe.winsys;
+	struct nouveau_stateobj *so;
+	boolean new_consts = FALSE;
 	int i;
 
+	if (fp->translated)
+		goto update_constants;
+
+	/*nv30->fallback_swrast &= ~NV30_NEW_FRAGPROG;*/
+	nv30_fragprog_translate(nv30, fp);
 	if (!fp->translated) {
-		nv30_fragprog_translate(nv30, fp);
-		if (!fp->translated)
-			assert(0);
+		/*nv30->fallback_swrast |= NV30_NEW_FRAGPROG;*/
+		return FALSE;
 	}
 
+	fp->buffer = ws->buffer_create(ws, 0x100, 0, fp->insn_len * 4);
+	nv30_fragprog_upload(nv30, fp);
+
+	so = so_new(4, 1);
+	so_method(so, nv30->screen->rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);
+	so_reloc (so, fp->buffer, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
+		  NOUVEAU_BO_RD | NOUVEAU_BO_LOW | NOUVEAU_BO_OR,
+		  NV34TCL_FP_ACTIVE_PROGRAM_DMA0, NV34TCL_FP_ACTIVE_PROGRAM_DMA1);
+	so_method(so, nv30->screen->rankine, NV34TCL_FP_CONTROL, 1);
+	so_data  (so, fp->fp_control);
+	/* FIXME: Add these, and you'll have big slowdown */
+	/*so_method(so, nv30->screen->rankine, NV34TCL_FP_REG_CONTROL, 1);
+	so_data  (so, fp->fp_control);*/
+	so_ref(so, &fp->so);
+
+update_constants:
 	if (fp->nr_consts) {
 		float *map;
-
+		
 		map = ws->buffer_map(ws, constbuf, PIPE_BUFFER_USAGE_CPU_READ);
 		for (i = 0; i < fp->nr_consts; i++) {
 			struct nv30_fragment_program_data *fpd = &fp->consts[i];
@@ -843,25 +866,20 @@ nv30_fragprog_bind(struct nv30_context *nv30, struct nv30_fragment_program *fp)
 			if (!memcmp(p, cb, 4 * sizeof(float)))
 				continue;
 			memcpy(p, cb, 4 * sizeof(float));
-			fp->on_hw = 0;
+			new_consts = TRUE;
 		}
 		ws->buffer_unmap(ws, constbuf);
-	}
 
-	if (!fp->on_hw) {
-		if (!fp->buffer)
-			fp->buffer = ws->buffer_create(ws, 0x100, 0,
-						       fp->insn_len * 4);
-		nv30_fragprog_upload(nv30, fp);
-		fp->on_hw = TRUE;
+		if (new_consts)
+			nv30_fragprog_upload(nv30, fp);
 	}
 
-	BEGIN_RING(rankine, NV34TCL_FP_CONTROL, 1);
-	OUT_RING  (fp->fp_control);
-	BEGIN_RING(rankine, NV34TCL_FP_REG_CONTROL, 1);
-	OUT_RING  (fp->fp_reg_control);
+	if (new_consts || fp->so != nv30->state.hw[NV30_STATE_FRAGPROG]) {
+		so_ref(fp->so, &nv30->state.hw[NV30_STATE_FRAGPROG]);
+		return TRUE;
+	}
 
-	nv30->fragprog.active = fp;
+	return FALSE;
 }
 
 void
@@ -872,3 +890,10 @@ nv30_fragprog_destroy(struct nv30_context *nv30,
 		FREE(fp->insn);
 }
 
+struct nv30_state_entry nv30_state_fragprog = {
+	.validate = nv30_fragprog_validate,
+	.dirty = {
+		.pipe = NV30_NEW_FRAGPROG,
+		.hw = NV30_STATE_FRAGPROG
+	}
+};
diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c b/src/gallium/drivers/nv30/nv30_fragtex.c
index abe77b51df..8c5e88ea1d 100644
--- a/src/gallium/drivers/nv30/nv30_fragtex.c
+++ b/src/gallium/drivers/nv30/nv30_fragtex.c
@@ -143,7 +143,7 @@ nv30_fragtex_build(struct nv30_context *nv30, int unit)
 static boolean
 nv30_fragtex_validate(struct nv30_context *nv30)
 {
-	struct nv30_fragment_program *fp = nv30->fragprog.current;
+	struct nv30_fragment_program *fp = nv30->fragprog;
 	struct nv30_state *state = &nv30->state;
 	struct nouveau_stateobj *so;
 	unsigned samplers, unit;
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 92695ce23c..8dc16d361d 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -539,6 +539,8 @@ nv30_fp_state_create(struct pipe_context *pipe,
 	fp = CALLOC(1, sizeof(struct nv30_fragment_program));
 	fp->pipe = *cso;
 
+	tgsi_scan_shader(fp->pipe.tokens, &fp->info);
+
 	return (void *)fp;
 }
 
@@ -546,13 +548,8 @@ static void
 nv30_fp_state_bind(struct pipe_context *pipe, void *hwcso)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	struct nv30_fragment_program *fp = hwcso;
-
-	if (!hwcso) {
-		return;
-	}
 
-	nv30->fragprog.current = fp;
+	nv30->fragprog = hwcso;
 	nv30->dirty |= NV30_NEW_FRAGPROG;
 }
 
diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index a897bc5068..20c5176160 100644
--- a/src/gallium/drivers/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
@@ -2,6 +2,7 @@
 #define __NV30_STATE_H__
 
 #include "pipe/p_state.h"
+#include "tgsi/util/tgsi_scan.h"
 
 struct nv30_sampler_state {
 	uint32_t fmt;
@@ -50,6 +51,7 @@ struct nv30_fragment_program_data {
 
 struct nv30_fragment_program {
 	struct pipe_shader_state pipe;
+	struct tgsi_shader_info info;
 
 	boolean translated;
 	boolean on_hw;
@@ -65,6 +67,7 @@ struct nv30_fragment_program {
 
 	uint32_t fp_control;
 	uint32_t fp_reg_control;
+	struct nouveau_stateobj *so;
 };
 
 struct nv30_miptree {
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 4ab62ddc01..c4ccc9422b 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -6,6 +6,7 @@ static struct nv30_state_entry *render_states[] = {
 	&nv30_state_rasterizer,
 	&nv30_state_scissor,
 	&nv30_state_stipple,
+	&nv30_state_fragprog,
 	&nv30_state_fragtex,
 	&nv30_state_vertprog,
 	&nv30_state_blend,
@@ -61,11 +62,6 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 		screen->cur_pctx = nv30->pctx_id;
 	}
 
-	if (nv30->dirty & NV30_NEW_FRAGPROG) {
-		nv30_fragprog_bind(nv30, nv30->fragprog.current);
-		/*XXX: clear NV30_NEW_FRAGPROG if no new program uploaded */
-	}
-
 	for (i = 0, states = state->dirty; states; i++) {
 		if (!(states & (1ULL << i)))
 			continue;
@@ -83,13 +79,7 @@ nv30_emit_hw_state(struct nv30_context *nv30)
 				      state->hw[NV30_STATE_FRAGTEX0+i]);
 		samplers &= ~(1ULL << i);
 	}
-
-	/* Fragment program */
-	BEGIN_RING(rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);
-	OUT_RELOC (nv30->fragprog.active->buffer, 0, NOUVEAU_BO_VRAM |
-	           NOUVEAU_BO_GART | NOUVEAU_BO_RD | NOUVEAU_BO_LOW |
-		   NOUVEAU_BO_OR, NV34TCL_FP_ACTIVE_PROGRAM_DMA0,
-		   NV34TCL_FP_ACTIVE_PROGRAM_DMA1);
+	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FRAGPROG]);
 }
 
 boolean
-- 
cgit v1.2.3


From 4ca346a8c0d0d4ea38705f8d3a3e5e690aa77daf Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 12 Jul 2008 11:45:51 +0200
Subject: nv30: Rename state emission func

---
 src/gallium/drivers/nv30/nv30_context.h    | 2 +-
 src/gallium/drivers/nv30/nv30_state_emit.c | 2 +-
 src/gallium/drivers/nv30/nv30_vbo.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 0c900c5598..c41cb29201 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -192,7 +192,7 @@ extern void nv30_fragtex_bind(struct nv30_context *);
 
 /* nv30_state.c and friends */
 extern boolean nv30_state_validate(struct nv30_context *nv30);
-extern void nv30_emit_hw_state(struct nv30_context *nv30);
+extern void nv30_state_emit(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
 extern struct nv30_state_entry nv30_state_rasterizer;
 extern struct nv30_state_entry nv30_state_scissor;
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index c4ccc9422b..1e69a6a6e2 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -46,7 +46,7 @@ nv30_state_do_validate(struct nv30_context *nv30,
 }
 
 void
-nv30_emit_hw_state(struct nv30_context *nv30)
+nv30_state_emit(struct nv30_context *nv30)
 {
 	struct nv30_state *state = &nv30->state;
 	struct nv30_screen *screen = nv30->screen;
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index 8e4ee7a874..0f82adfee0 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -156,7 +156,7 @@ nv30_vbo_validate_state(struct nv30_context *nv30,
 
 	nv30_state_validate(nv30);
 
-	nv30_emit_hw_state(nv30);
+	nv30_state_emit(nv30);
 
 	if (nv30->dirty & NV30_NEW_ARRAYS) {
 		nv30_vbo_arrays_update(nv30);
-- 
cgit v1.2.3


From 12118fcd123992f48ce78629e79e9949b96cd525 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 12 Jul 2008 13:16:47 +0200
Subject: nv30: Emit vertex buffer objects using state objects

---
 src/gallium/drivers/nv30/nv30_context.h    |  14 +-
 src/gallium/drivers/nv30/nv30_screen.c     |   2 +-
 src/gallium/drivers/nv30/nv30_state.c      |   6 +
 src/gallium/drivers/nv30/nv30_state_emit.c |   8 +-
 src/gallium/drivers/nv30/nv30_vbo.c        | 628 +++++++++++++++++------------
 5 files changed, 399 insertions(+), 259 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 2e7b62a69a..823b34a7c3 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -128,20 +128,17 @@ struct nv30_context {
 	struct pipe_blend_color blend_colour;
 	struct pipe_viewport_state viewport;
 	struct pipe_framebuffer_state framebuffer;
+	struct pipe_buffer *idxbuf;
+	unsigned idxbuf_format;
 	struct nv30_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
 	struct nv30_miptree *tex_miptree[PIPE_MAX_SAMPLERS];
 	unsigned nr_samplers;
 	unsigned nr_textures;
 	unsigned dirty_samplers;
-
-	unsigned vb_enable;
-	struct {
-		struct pipe_buffer *buffer;
-		unsigned delta;
-	} vb[16];
-
-	struct pipe_vertex_buffer  vtxbuf[PIPE_MAX_ATTRIBS];
+	struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS];
+	unsigned vtxbuf_nr;
 	struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
+	unsigned vtxelt_nr;
 	const unsigned *edgeflags;
 };
 
@@ -193,6 +190,7 @@ extern struct nv30_state_entry nv30_state_zsa;
 extern struct nv30_state_entry nv30_state_viewport;
 extern struct nv30_state_entry nv30_state_framebuffer;
 extern struct nv30_state_entry nv30_state_fragtex;
+extern struct nv30_state_entry nv30_state_vbo;
 
 /* nv30_vbo.c */
 extern boolean nv30_draw_arrays(struct pipe_context *, unsigned mode,
diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nv30/nv30_screen.c
index 9c57636989..de5590af14 100644
--- a/src/gallium/drivers/nv30/nv30_screen.c
+++ b/src/gallium/drivers/nv30/nv30_screen.c
@@ -57,7 +57,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, int param)
 		return 13;
 	case NOUVEAU_CAP_HW_VTXBUF:
 	case NOUVEAU_CAP_HW_IDXBUF:
-		return 0;
+		return 1;
 	default:
 		NOUVEAU_ERR("Unknown PIPE_CAP %d\n", param);
 		return 0;
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 4fe1def74d..4d6303ebc2 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -644,7 +644,10 @@ nv30_set_vertex_buffers(struct pipe_context *pipe, unsigned count,
 	struct nv30_context *nv30 = nv30_context(pipe);
 
 	memcpy(nv30->vtxbuf, vb, sizeof(*vb) * count);
+	nv30->vtxbuf_nr = count;
+
 	nv30->dirty |= NV30_NEW_ARRAYS;
+	/*nv30->draw_dirty |= NV30_NEW_ARRAYS;*/
 }
 
 static void
@@ -654,7 +657,10 @@ nv30_set_vertex_elements(struct pipe_context *pipe, unsigned count,
 	struct nv30_context *nv30 = nv30_context(pipe);
 
 	memcpy(nv30->vtxelt, ve, sizeof(*ve) * count);
+	nv30->vtxelt_nr = count;
+
 	nv30->dirty |= NV30_NEW_ARRAYS;
+	/*nv30->draw_dirty |= NV30_NEW_ARRAYS;*/
 }
 
 static void
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 1e69a6a6e2..40fed621b2 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -13,6 +13,7 @@ static struct nv30_state_entry *render_states[] = {
 	&nv30_state_blend_colour,
 	&nv30_state_zsa,
 	&nv30_state_viewport,
+	&nv30_state_vbo,
 	NULL
 };
 
@@ -39,10 +40,7 @@ nv30_state_do_validate(struct nv30_context *nv30,
 
 		states++;
 	}
-
-/*	TODO: uncomment when finished converting
 	nv30->dirty = 0;
-*/
 }
 
 void
@@ -71,6 +69,8 @@ nv30_state_emit(struct nv30_context *nv30)
 		states &= ~(1ULL << i);
 	}
 
+	state->dirty = 0;
+
 	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
 	for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
 		if (!(samplers & (1 << i)))
@@ -80,6 +80,8 @@ nv30_state_emit(struct nv30_context *nv30)
 		samplers &= ~(1ULL << i);
 	}
 	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FRAGPROG]);
+	if (state->hw[NV30_STATE_VTXBUF] /*&& nv30->render_mode == HW*/)
+		so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_VTXBUF]);
 }
 
 boolean
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index 0f82adfee0..d930557f6b 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -7,45 +7,119 @@
 
 #include "nouveau/nouveau_channel.h"
 #include "nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_util.h"
+
+#define FORCE_SWTNL 0
 
 static INLINE int
-nv30_vbo_ncomp(uint format)
+nv30_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
 {
-	int ncomp = 0;
+	char fs[128];
+
+	switch (pipe) {
+	case PIPE_FORMAT_R32_FLOAT:
+	case PIPE_FORMAT_R32G32_FLOAT:
+	case PIPE_FORMAT_R32G32B32_FLOAT:
+	case PIPE_FORMAT_R32G32B32A32_FLOAT:
+		*fmt = NV34TCL_VTXFMT_TYPE_FLOAT;
+		break;
+	case PIPE_FORMAT_R8_UNORM:
+	case PIPE_FORMAT_R8G8_UNORM:
+	case PIPE_FORMAT_R8G8B8_UNORM:
+	case PIPE_FORMAT_R8G8B8A8_UNORM:
+		*fmt = NV34TCL_VTXFMT_TYPE_UBYTE;
+		break;
+	case PIPE_FORMAT_R16_SSCALED:
+	case PIPE_FORMAT_R16G16_SSCALED:
+	case PIPE_FORMAT_R16G16B16_SSCALED:
+	case PIPE_FORMAT_R16G16B16A16_SSCALED:
+		*fmt = NV34TCL_VTXFMT_TYPE_USHORT;
+		break;
+	default:
+		pf_sprint_name(fs, pipe);
+		NOUVEAU_ERR("Unknown format %s\n", fs);
+		return 1;
+	}
 
-	if (pf_size_x(format)) ncomp++;
-	if (pf_size_y(format)) ncomp++;
-	if (pf_size_z(format)) ncomp++;
-	if (pf_size_w(format)) ncomp++;
+	switch (pipe) {
+	case PIPE_FORMAT_R8_UNORM:
+	case PIPE_FORMAT_R32_FLOAT:
+	case PIPE_FORMAT_R16_SSCALED:
+		*ncomp = 1;
+		break;
+	case PIPE_FORMAT_R8G8_UNORM:
+	case PIPE_FORMAT_R32G32_FLOAT:
+	case PIPE_FORMAT_R16G16_SSCALED:
+		*ncomp = 2;
+		break;
+	case PIPE_FORMAT_R8G8B8_UNORM:
+	case PIPE_FORMAT_R32G32B32_FLOAT:
+	case PIPE_FORMAT_R16G16B16_SSCALED:
+		*ncomp = 3;
+		break;
+	case PIPE_FORMAT_R8G8B8A8_UNORM:
+	case PIPE_FORMAT_R32G32B32A32_FLOAT:
+	case PIPE_FORMAT_R16G16B16A16_SSCALED:
+		*ncomp = 4;
+		break;
+	default:
+		pf_sprint_name(fs, pipe);
+		NOUVEAU_ERR("Unknown format %s\n", fs);
+		return 1;
+	}
 
-	return ncomp;
+	return 0;
 }
 
-static INLINE int
-nv30_vbo_type(uint format)
+static boolean
+nv30_vbo_set_idxbuf(struct nv30_context *nv30, struct pipe_buffer *ib,
+		    unsigned ib_size)
 {
-	switch (pf_type(format)) {
-	case PIPE_FORMAT_TYPE_FLOAT:
-		return NV34TCL_VTXFMT_TYPE_FLOAT;
-	case PIPE_FORMAT_TYPE_UNORM:
-		return NV34TCL_VTXFMT_TYPE_UBYTE;
+	struct pipe_screen *pscreen = &nv30->screen->pipe;
+	unsigned type;
+
+	if (!ib) {
+		nv30->idxbuf = NULL;
+		nv30->idxbuf_format = 0xdeadbeef;
+		return FALSE;
+	}
+
+	if (!pscreen->get_param(pscreen, NOUVEAU_CAP_HW_IDXBUF) || ib_size == 1)
+		return FALSE;
+
+	switch (ib_size) {
+	case 2:
+		type = NV34TCL_IDXBUF_FORMAT_TYPE_U16;
+		break;
+	case 4:
+		type = NV34TCL_IDXBUF_FORMAT_TYPE_U32;
+		break;
 	default:
-		NOUVEAU_ERR("Unknown format 0x%08x\n", format);
-		return NV34TCL_VTXFMT_TYPE_FLOAT;
+		return FALSE;
 	}
+
+	if (ib != nv30->idxbuf ||
+	    type != nv30->idxbuf_format) {
+		nv30->dirty |= NV30_NEW_ARRAYS;
+		nv30->idxbuf = ib;
+		nv30->idxbuf_format = type;
+	}
+
+	return TRUE;
 }
 
 static boolean
-nv30_vbo_static_attrib(struct nv30_context *nv30, int attrib,
-		       struct pipe_vertex_element *ve,
+nv30_vbo_static_attrib(struct nv30_context *nv30, struct nouveau_stateobj *so,
+		       int attrib, struct pipe_vertex_element *ve,
 		       struct pipe_vertex_buffer *vb)
 {
 	struct pipe_winsys *ws = nv30->pipe.winsys;
-	int type, ncomp;
+	struct nouveau_grobj *rankine = nv30->screen->rankine;
+	unsigned type, ncomp;
 	void *map;
 
-	type = nv30_vbo_type(ve->src_format);
-	ncomp = nv30_vbo_ncomp(ve->src_format);
+	if (nv30_vbo_format_to_hw(ve->src_format, &type, &ncomp))
+		return FALSE;
 
 	map  = ws->buffer_map(ws, vb->buffer, PIPE_BUFFER_USAGE_CPU_READ);
 	map += vb->buffer_offset + ve->src_offset;
@@ -55,31 +129,28 @@ nv30_vbo_static_attrib(struct nv30_context *nv30, int attrib,
 	{
 		float *v = map;
 
-		BEGIN_RING(rankine, NV34TCL_VTX_ATTR_4F_X(attrib), 4);
 		switch (ncomp) {
 		case 4:
-			OUT_RINGf(v[0]);
-			OUT_RINGf(v[1]);
-			OUT_RINGf(v[2]);
-			OUT_RINGf(v[3]);
+			so_method(so, rankine, NV34TCL_VTX_ATTR_4F_X(attrib), 4);
+			so_data  (so, fui(v[0]));
+			so_data  (so, fui(v[1]));
+			so_data  (so, fui(v[2]));
+			so_data  (so, fui(v[3]));
 			break;
 		case 3:
-			OUT_RINGf(v[0]);
-			OUT_RINGf(v[1]);
-			OUT_RINGf(v[2]);
-			OUT_RINGf(1.0);
+			so_method(so, rankine, NV34TCL_VTX_ATTR_3F_X(attrib), 3);
+			so_data  (so, fui(v[0]));
+			so_data  (so, fui(v[1]));
+			so_data  (so, fui(v[2]));
 			break;
 		case 2:
-			OUT_RINGf(v[0]);
-			OUT_RINGf(v[1]);
-			OUT_RINGf(0.0);
-			OUT_RINGf(1.0);
+			so_method(so, rankine, NV34TCL_VTX_ATTR_2F_X(attrib), 2);
+			so_data  (so, fui(v[0]));
+			so_data  (so, fui(v[1]));
 			break;
 		case 1:
-			OUT_RINGf(v[0]);
-			OUT_RINGf(0.0);
-			OUT_RINGf(0.0);
-			OUT_RINGf(1.0);
+			so_method(so, rankine, NV34TCL_VTX_ATTR_1F(attrib), 1);
+			so_data  (so, fui(v[0]));
 			break;
 		default:
 			ws->buffer_unmap(ws, vb->buffer);
@@ -97,209 +168,202 @@ nv30_vbo_static_attrib(struct nv30_context *nv30, int attrib,
 	return TRUE;
 }
 
-static void
-nv30_vbo_arrays_update(struct nv30_context *nv30)
+boolean
+nv30_draw_arrays(struct pipe_context *pipe,
+		 unsigned mode, unsigned start, unsigned count)
 {
-	struct nv30_vertex_program *vp = nv30->vertprog;
-	uint32_t inputs, vtxfmt[16];
-	int hw, num_hw = 0;
-
-	nv30->vb_enable = 0;
+	struct nv30_context *nv30 = nv30_context(pipe);
+	struct nouveau_channel *chan = nv30->nvws->channel;
+	unsigned restart = 0;
 
-	inputs = vp->ir;
-	for (hw = 0; hw < 16 && inputs; hw++) {
-		if (inputs & (1 << hw)) {
-			num_hw = hw;
-			inputs &= ~(1 << hw);
-		}
+	nv30_vbo_set_idxbuf(nv30, NULL, 0);
+	if (FORCE_SWTNL || !nv30_state_validate(nv30)) {
+		/*return nv30_draw_elements_swtnl(pipe, NULL, 0,
+						mode, start, count);*/
+		return FALSE;
 	}
-	num_hw++;
 
-	inputs = vp->ir;
-	for (hw = 0; hw < num_hw; hw++) {
-		struct pipe_vertex_element *ve;
-		struct pipe_vertex_buffer *vb;
+	while (count) {
+		unsigned vc, nr;
 
-		if (!(inputs & (1 << hw))) {
-			vtxfmt[hw] = NV34TCL_VTXFMT_TYPE_FLOAT;
+		nv30_state_emit(nv30);
+
+		vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 256,
+					mode, start, count, &restart);
+		if (!vc) {
+			FIRE_RING(NULL);
 			continue;
 		}
 
-		ve = &nv30->vtxelt[hw];
-		vb = &nv30->vtxbuf[ve->vertex_buffer_index];
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (nvgl_primitive(mode));
 
-		if (vb->pitch == 0) {
-			vtxfmt[hw] = NV34TCL_VTXFMT_TYPE_FLOAT;
-			if (nv30_vbo_static_attrib(nv30, hw, ve, vb) == TRUE)
-				continue;
+		nr = (vc & 0xff);
+		if (nr) {
+			BEGIN_RING(rankine, NV34TCL_VB_VERTEX_BATCH, 1);
+			OUT_RING  (((nr - 1) << 24) | start);
+			start += nr;
 		}
 
-		nv30->vb_enable |= (1 << hw);
-		nv30->vb[hw].delta = vb->buffer_offset + ve->src_offset;
-		nv30->vb[hw].buffer = vb->buffer;
+		nr = vc >> 8;
+		while (nr) {
+			unsigned push = nr > 2047 ? 2047 : nr;
+
+			nr -= push;
 
-		vtxfmt[hw] = ((vb->pitch << NV34TCL_VTXFMT_STRIDE_SHIFT) |
-			      (nv30_vbo_ncomp(ve->src_format) <<
-			       NV34TCL_VTXFMT_SIZE_SHIFT) |
-			      nv30_vbo_type(ve->src_format));
+			BEGIN_RING_NI(rankine, NV34TCL_VB_VERTEX_BATCH, push);
+			while (push--) {
+				OUT_RING(((0x100 - 1) << 24) | start);
+				start += 0x100;
+			}
+		}
+
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (0);
+
+		count -= vc;
+		start = restart;
 	}
 
-	BEGIN_RING(rankine, NV34TCL_VTXFMT(0), num_hw);
-	OUT_RINGp (vtxfmt, num_hw);
+	pipe->flush(pipe, 0, NULL);
+	return TRUE;
 }
 
-static boolean
-nv30_vbo_validate_state(struct nv30_context *nv30,
-			struct pipe_buffer *ib, unsigned ib_format)
+static INLINE void
+nv30_draw_elements_u08(struct nv30_context *nv30, void *ib,
+		       unsigned mode, unsigned start, unsigned count)
 {
-	unsigned inputs;
+	struct nouveau_channel *chan = nv30->nvws->channel;
 
-	nv30_state_validate(nv30);
+	while (count) {
+		uint8_t *elts = (uint8_t *)ib + start;
+		unsigned vc, push, restart = 0;
 
-	nv30_state_emit(nv30);
+		nv30_state_emit(nv30);
 
-	if (nv30->dirty & NV30_NEW_ARRAYS) {
-		nv30_vbo_arrays_update(nv30);
-		nv30->dirty &= ~NV30_NEW_ARRAYS;
-	}
+		vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 2,
+					mode, start, count, &restart);
+		if (vc == 0) {
+			FIRE_RING(NULL);
+			continue;
+		}
+		count -= vc;
 
-	inputs = nv30->vb_enable;
-	while (inputs) {
-		unsigned a = ffs(inputs) - 1;
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (nvgl_primitive(mode));
 
-		inputs &= ~(1 << a);
+		if (vc & 1) {
+			BEGIN_RING(rankine, NV34TCL_VB_ELEMENT_U32, 1);
+			OUT_RING  (elts[0]);
+			elts++; vc--;
+		}
 
-		BEGIN_RING(rankine, NV34TCL_VTXBUF_ADDRESS(a), 1);
-		OUT_RELOC (nv30->vb[a].buffer, nv30->vb[a].delta,
-			   NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_LOW |
-			   NOUVEAU_BO_OR | NOUVEAU_BO_RD, 0,
-			   NV34TCL_VTXBUF_ADDRESS_DMA1);
-	}
+		while (vc) {
+			unsigned i;
 
-	if (ib) {
-		BEGIN_RING(rankine, NV34TCL_IDXBUF_ADDRESS, 2);
-		OUT_RELOCl(ib, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
-			   NOUVEAU_BO_RD);
-		OUT_RELOCd(ib, ib_format, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
-			   NOUVEAU_BO_RD | NOUVEAU_BO_OR,
-			   0, NV34TCL_IDXBUF_FORMAT_DMA1);
-	}
+			push = MIN2(vc, 2047 * 2);
 
-	BEGIN_RING(rankine, 0x1710, 1);
-	OUT_RING  (0); /* vtx cache flush */
+			BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push >> 1);
+			for (i = 0; i < push; i+=2)
+				OUT_RING((elts[i+1] << 16) | elts[i]);
 
-	return TRUE;
-}
+			vc -= push;
+			elts += push;
+		}
 
-boolean
-nv30_draw_arrays(struct pipe_context *pipe, unsigned mode, unsigned start,
-		 unsigned count)
-{
-	struct nv30_context *nv30 = nv30_context(pipe);
-	unsigned nr;
-	boolean ret;
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (0);
 
-	ret = nv30_vbo_validate_state(nv30, NULL, 0);
-	if (!ret) {
-		NOUVEAU_ERR("state validate failed\n");
-		return FALSE;
+		start = restart;
 	}
+}
 
-	BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
-	OUT_RING  (nvgl_primitive(mode));
-
-	nr = (count & 0xff);
-	if (nr) {
-		BEGIN_RING(rankine, NV34TCL_VB_VERTEX_BATCH, 1);
-		OUT_RING  (((nr - 1) << 24) | start);
-		start += nr;
-	}
+static INLINE void
+nv30_draw_elements_u16(struct nv30_context *nv30, void *ib,
+		       unsigned mode, unsigned start, unsigned count)
+{
+	struct nouveau_channel *chan = nv30->nvws->channel;
 
-	nr = count >> 8;
-	while (nr) {
-		unsigned push = nr > 2047 ? 2047 : nr;
+	while (count) {
+		uint16_t *elts = (uint16_t *)ib + start;
+		unsigned vc, push, restart = 0;
 
-		nr -= push;
+		nv30_state_emit(nv30);
 
-		BEGIN_RING_NI(rankine, NV34TCL_VB_VERTEX_BATCH, push);
-		while (push--) {
-			OUT_RING(((0x100 - 1) << 24) | start);
-			start += 0x100;
+		vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 2,
+					mode, start, count, &restart);
+		if (vc == 0) {
+			FIRE_RING(NULL);
+			continue;
 		}
-	}
+		count -= vc;
 
-	BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
-	OUT_RING  (0);
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (nvgl_primitive(mode));
 
-	pipe->flush(pipe, 0, NULL);
-	return TRUE;
-}
+		if (vc & 1) {
+			BEGIN_RING(rankine, NV34TCL_VB_ELEMENT_U32, 1);
+			OUT_RING  (elts[0]);
+			elts++; vc--;
+		}
 
-static INLINE void
-nv30_draw_elements_u08(struct nv30_context *nv30, void *ib,
-		       unsigned start, unsigned count)
-{
-	uint8_t *elts = (uint8_t *)ib + start;
-	int push, i;
+		while (vc) {
+			unsigned i;
 
-	if (count & 1) {
-		BEGIN_RING(rankine, NV34TCL_VB_ELEMENT_U32, 1);
-		OUT_RING  (elts[0]);
-		elts++; count--;
-	}
+			push = MIN2(vc, 2047 * 2);
 
-	while (count) {
-		push = MIN2(count, 2047 * 2);
+			BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push >> 1);
+			for (i = 0; i < push; i+=2)
+				OUT_RING((elts[i+1] << 16) | elts[i]);
 
-		BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push >> 1);
-		for (i = 0; i < push; i+=2)
-			OUT_RING((elts[i+1] << 16) | elts[i]);
+			vc -= push;
+			elts += push;
+		}
+
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (0);
 
-		count -= push;
-		elts  += push;
+		start = restart;
 	}
 }
 
 static INLINE void
-nv30_draw_elements_u16(struct nv30_context *nv30, void *ib,
-		       unsigned start, unsigned count)
+nv30_draw_elements_u32(struct nv30_context *nv30, void *ib,
+		       unsigned mode, unsigned start, unsigned count)
 {
-	uint16_t *elts = (uint16_t *)ib + start;
-	int push, i;
-
-	if (count & 1) {
-		BEGIN_RING(rankine, NV34TCL_VB_ELEMENT_U32, 1);
-		OUT_RING  (elts[0]);
-		elts++; count--;
-	}
+	struct nouveau_channel *chan = nv30->nvws->channel;
 
 	while (count) {
-		push = MIN2(count, 2047 * 2);
+		uint32_t *elts = (uint32_t *)ib + start;
+		unsigned vc, push, restart = 0;
 
-		BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push >> 1);
-		for (i = 0; i < push; i+=2)
-			OUT_RING((elts[i+1] << 16) | elts[i]);
+		nv30_state_emit(nv30);
 
-		count -= push;
-		elts  += push;
-	}
-}
+		vc = nouveau_vbuf_split(chan->pushbuf->remaining, 5, 1,
+					mode, start, count, &restart);
+		if (vc == 0) {
+			FIRE_RING(NULL);
+			continue;
+		}
+		count -= vc;
 
-static INLINE void
-nv30_draw_elements_u32(struct nv30_context *nv30, void *ib,
-		       unsigned start, unsigned count)
-{
-	uint32_t *elts = (uint32_t *)ib + start;
-	int push;
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (nvgl_primitive(mode));
 
-	while (count) {
-		push = MIN2(count, 2047);
+		while (vc) {
+			push = MIN2(vc, 2047);
 
-		BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U32, push);
-		OUT_RINGp    (elts, push);
+			BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U32, push);
+			OUT_RINGp    (elts, push);
 
-		count -= push;
-		elts  += push;
+			vc -= push;
+			elts += push;
+		}
+
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (0);
+
+		start = restart;
 	}
 }
 
@@ -310,99 +374,82 @@ nv30_draw_elements_inline(struct pipe_context *pipe,
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 	struct pipe_winsys *ws = pipe->winsys;
-	boolean ret;
 	void *map;
 
-	ret =  nv30_vbo_validate_state(nv30, NULL, 0);
-	if (!ret) {
-		NOUVEAU_ERR("state validate failed\n");
-		return FALSE;
-	}
-
 	map = ws->buffer_map(ws, ib, PIPE_BUFFER_USAGE_CPU_READ);
 	if (!ib) {
 		NOUVEAU_ERR("failed mapping ib\n");
 		return FALSE;
 	}
 
-	BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
-	OUT_RING  (nvgl_primitive(mode));
-
 	switch (ib_size) {
 	case 1:
-		nv30_draw_elements_u08(nv30, map, start, count);
+		nv30_draw_elements_u08(nv30, map, mode, start, count);
 		break;
 	case 2:
-		nv30_draw_elements_u16(nv30, map, start, count);
+		nv30_draw_elements_u16(nv30, map, mode, start, count);
 		break;
 	case 4:
-		nv30_draw_elements_u32(nv30, map, start, count);
+		nv30_draw_elements_u32(nv30, map, mode, start, count);
 		break;
 	default:
 		NOUVEAU_ERR("invalid idxbuf fmt %d\n", ib_size);
 		break;
 	}
 
-	BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
-	OUT_RING  (0);
-
 	ws->buffer_unmap(ws, ib);
-
 	return TRUE;
 }
 
 static boolean
 nv30_draw_elements_vbo(struct pipe_context *pipe,
-		       struct pipe_buffer *ib, unsigned ib_size,
 		       unsigned mode, unsigned start, unsigned count)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	unsigned nr, type;
-	boolean ret;
-
-	switch (ib_size) {
-	case 2:
-		type = NV34TCL_IDXBUF_FORMAT_TYPE_U16;
-		break;
-	case 4:
-		type = NV34TCL_IDXBUF_FORMAT_TYPE_U32;
-		break;
-	default:
-		NOUVEAU_ERR("invalid idxbuf fmt %d\n", ib_size);
-		return FALSE;
-	}
+	struct nouveau_channel *chan = nv30->nvws->channel;
+	unsigned restart = 0;
 
-	ret = nv30_vbo_validate_state(nv30, ib, type);
-	if (!ret) {
-		NOUVEAU_ERR("failed state validation\n");
-		return FALSE;
-	}
+	while (count) {
+		unsigned nr, vc;
 
-	BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
-	OUT_RING  (nvgl_primitive(mode));
+		nv30_state_emit(nv30);
 
-	nr = (count & 0xff);
-	if (nr) {
-		BEGIN_RING(rankine, NV34TCL_VB_INDEX_BATCH, 1);
-		OUT_RING  (((nr - 1) << 24) | start);
-		start += nr;
-	}
+		vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 256,
+					mode, start, count, &restart);
+		if (!vc) {
+			FIRE_RING(NULL);
+			continue;
+		}
+		
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (nvgl_primitive(mode));
+
+		nr = (vc & 0xff);
+		if (nr) {
+			BEGIN_RING(rankine, NV34TCL_VB_INDEX_BATCH, 1);
+			OUT_RING  (((nr - 1) << 24) | start);
+			start += nr;
+		}
 
-	nr = count >> 8;
-	while (nr) {
-		unsigned push = nr > 2047 ? 2047 : nr;
+		nr = vc >> 8;
+		while (nr) {
+			unsigned push = nr > 2047 ? 2047 : nr;
 
-		nr -= push;
+			nr -= push;
 
-		BEGIN_RING_NI(rankine, NV34TCL_VB_INDEX_BATCH, push);
-		while (push--) {
-			OUT_RING(((0x100 - 1) << 24) | start);
-			start += 0x100;
+			BEGIN_RING_NI(rankine, NV34TCL_VB_INDEX_BATCH, push);
+			while (push--) {
+				OUT_RING(((0x100 - 1) << 24) | start);
+				start += 0x100;
+			}
 		}
-	}
 
-	BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
-	OUT_RING  (0);
+		BEGIN_RING(rankine, NV34TCL_VERTEX_BEGIN_END, 1);
+		OUT_RING  (0);
+
+		count -= vc;
+		start = restart;
+	}
 
 	return TRUE;
 }
@@ -412,10 +459,19 @@ nv30_draw_elements(struct pipe_context *pipe,
 		   struct pipe_buffer *indexBuffer, unsigned indexSize,
 		   unsigned mode, unsigned start, unsigned count)
 {
-/*	if (indexSize != 1) {
-		nv30_draw_elements_vbo(pipe, indexBuffer, indexSize,
-				       mode, start, count);
-	} else */{
+	struct nv30_context *nv30 = nv30_context(pipe);
+	boolean idxbuf;
+
+	idxbuf = nv30_vbo_set_idxbuf(nv30, indexBuffer, indexSize);
+	if (FORCE_SWTNL || !nv30_state_validate(nv30)) {
+		/*return nv30_draw_elements_swtnl(pipe, NULL, 0,
+						mode, start, count);*/
+		return FALSE;	
+	}
+
+	if (idxbuf) {
+		nv30_draw_elements_vbo(pipe, mode, start, count);
+	} else {
 		nv30_draw_elements_inline(pipe, indexBuffer, indexSize,
 					  mode, start, count);
 	}
@@ -424,4 +480,82 @@ nv30_draw_elements(struct pipe_context *pipe,
 	return TRUE;
 }
 
+static boolean
+nv30_vbo_validate(struct nv30_context *nv30)
+{
+	struct nouveau_stateobj *vtxbuf, *vtxfmt, *sattr = NULL;
+	struct nouveau_grobj *rankine = nv30->screen->rankine;
+	struct pipe_buffer *ib = nv30->idxbuf;
+	unsigned ib_format = nv30->idxbuf_format;
+	unsigned vb_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD;
+	int hw;
+
+	if (nv30->edgeflags) {
+		/*nv30->fallback_swtnl |= NV30_NEW_ARRAYS;*/
+		return FALSE;
+	}
+
+	vtxbuf = so_new(20, 18);
+	so_method(vtxbuf, rankine, NV34TCL_VTXBUF_ADDRESS(0), nv30->vtxelt_nr);
+	vtxfmt = so_new(17, 0);
+	so_method(vtxfmt, rankine, NV34TCL_VTXFMT(0), nv30->vtxelt_nr);
 
+	for (hw = 0; hw < nv30->vtxelt_nr; hw++) {
+		struct pipe_vertex_element *ve;
+		struct pipe_vertex_buffer *vb;
+		unsigned type, ncomp;
+
+		ve = &nv30->vtxelt[hw];
+		vb = &nv30->vtxbuf[ve->vertex_buffer_index];
+
+		if (!vb->pitch) {
+			if (!sattr)
+				sattr = so_new(16 * 5, 0);
+
+			if (nv30_vbo_static_attrib(nv30, sattr, hw, ve, vb)) {
+				so_data(vtxbuf, 0);
+				so_data(vtxfmt, NV34TCL_VTXFMT_TYPE_FLOAT);
+				continue;
+			}
+		}
+
+		if (nv30_vbo_format_to_hw(ve->src_format, &type, &ncomp)) {
+			/*nv30->fallback_swtnl |= NV30_NEW_ARRAYS;*/
+			so_ref(NULL, &vtxbuf);
+			so_ref(NULL, &vtxfmt);
+			return FALSE;
+		}
+
+		so_reloc(vtxbuf, vb->buffer, vb->buffer_offset + ve->src_offset,
+			 vb_flags | NOUVEAU_BO_LOW | NOUVEAU_BO_OR,
+			 0, NV34TCL_VTXBUF_ADDRESS_DMA1);
+		so_data (vtxfmt, ((vb->pitch << NV34TCL_VTXFMT_STRIDE_SHIFT) |
+				  (ncomp << NV34TCL_VTXFMT_SIZE_SHIFT) | type));
+	}
+
+	if (ib) {
+		so_method(vtxbuf, rankine, NV34TCL_IDXBUF_ADDRESS, 2);
+		so_reloc (vtxbuf, ib, 0, vb_flags | NOUVEAU_BO_LOW, 0, 0);
+		so_reloc (vtxbuf, ib, ib_format, vb_flags | NOUVEAU_BO_OR,
+			  0, NV34TCL_IDXBUF_FORMAT_DMA1);
+	}
+
+	so_method(vtxbuf, rankine, 0x1710, 1);
+	so_data  (vtxbuf, 0);
+
+	so_ref(vtxbuf, &nv30->state.hw[NV30_STATE_VTXBUF]);
+	nv30->state.dirty |= (1ULL << NV30_STATE_VTXBUF);
+	so_ref(vtxfmt, &nv30->state.hw[NV30_STATE_VTXFMT]);
+	nv30->state.dirty |= (1ULL << NV30_STATE_VTXFMT);
+	so_ref(sattr, &nv30->state.hw[NV30_STATE_VTXATTR]);
+	nv30->state.dirty |= (1ULL << NV30_STATE_VTXATTR);
+	return FALSE;
+}
+
+struct nv30_state_entry nv30_state_vbo = {
+	.validate = nv30_vbo_validate,
+	.dirty = {
+		.pipe = NV30_NEW_ARRAYS,
+		.hw = 0,
+	}
+};
-- 
cgit v1.2.3


From 248831e741602450fa957d7f63b1ff1e1395c412 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 30 Aug 2008 22:30:03 +0200
Subject: nv30: activate fp texture units when needed, to get texturing

---
 src/gallium/drivers/nv30/nv30_state_emit.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 40fed621b2..9c96085408 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -71,6 +71,10 @@ nv30_state_emit(struct nv30_context *nv30)
 
 	state->dirty = 0;
 
+	/* FIXME/TODO: Try to find a way to reemit only when changed */
+	BEGIN_RING(rankine, NV34TCL_TX_UNITS_ENABLE, 1);
+	OUT_RING(state->fp_samplers);
+
 	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
 	for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
 		if (!(samplers & (1 << i)))
-- 
cgit v1.2.3


From 0c47bd0374e533f614ca3013f429fc32946e5be7 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sun, 31 Aug 2008 11:10:08 +0200
Subject: nv30: set fp samplers with fragprog generation

---
 src/gallium/drivers/nv30/nv30_fragprog.c   | 4 +++-
 src/gallium/drivers/nv30/nv30_state_emit.c | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c
index 02f30ad9ba..320ba3f4bf 100644
--- a/src/gallium/drivers/nv30/nv30_fragprog.c
+++ b/src/gallium/drivers/nv30/nv30_fragprog.c
@@ -852,7 +852,7 @@ nv30_fragprog_validate(struct nv30_context *nv30)
 	fp->buffer = ws->buffer_create(ws, 0x100, 0, fp->insn_len * 4);
 	nv30_fragprog_upload(nv30, fp);
 
-	so = so_new(6, 1);
+	so = so_new(8, 1);
 	so_method(so, nv30->screen->rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);
 	so_reloc (so, fp->buffer, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
 		  NOUVEAU_BO_RD | NOUVEAU_BO_LOW | NOUVEAU_BO_OR,
@@ -861,6 +861,8 @@ nv30_fragprog_validate(struct nv30_context *nv30)
 	so_data  (so, fp->fp_control);
 	so_method(so, nv30->screen->rankine, NV34TCL_FP_REG_CONTROL, 1);
 	so_data  (so, fp->fp_reg_control);
+	so_method(so, nv30->screen->rankine, NV34TCL_TX_UNITS_ENABLE, 1);
+	so_data  (so, fp->samplers);
 	so_ref(so, &fp->so);
 
 update_constants:
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 9c96085408..40fed621b2 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -71,10 +71,6 @@ nv30_state_emit(struct nv30_context *nv30)
 
 	state->dirty = 0;
 
-	/* FIXME/TODO: Try to find a way to reemit only when changed */
-	BEGIN_RING(rankine, NV34TCL_TX_UNITS_ENABLE, 1);
-	OUT_RING(state->fp_samplers);
-
 	so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
 	for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
 		if (!(samplers & (1 << i)))
-- 
cgit v1.2.3


From ab3a9f1eeda5b216099763f6eb932da723309f4a Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 8 Jan 2009 12:41:45 +0000
Subject: gallium: Replace uint64 by standard uint64_t.

uint64 is not (so?) standard, and often redefined by third parties,
causing name clashes.
---
 src/gallium/drivers/nv30/nv30_query.c      | 4 ++--
 src/gallium/drivers/nv30/nv30_state_emit.c | 2 +-
 src/gallium/drivers/nv40/nv40_query.c      | 4 ++--
 src/gallium/drivers/nv40/nv40_state_emit.c | 2 +-
 src/gallium/drivers/nv50/nv50_query.c      | 2 +-
 src/gallium/drivers/softpipe/sp_context.h  | 2 +-
 src/gallium/drivers/softpipe/sp_query.c    | 6 +++---
 src/gallium/drivers/trace/tr_context.c     | 4 ++--
 src/gallium/include/pipe/p_compiler.h      | 1 -
 src/gallium/include/pipe/p_context.h       | 2 +-
 10 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/drivers/nv30/nv30_query.c b/src/gallium/drivers/nv30/nv30_query.c
index d40d75f264..2f974cf5c4 100644
--- a/src/gallium/drivers/nv30/nv30_query.c
+++ b/src/gallium/drivers/nv30/nv30_query.c
@@ -50,7 +50,7 @@ nv30_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
 	 * the existing query to notify completion, but it could be better.
 	 */
 	if (q->object) {
-		uint64 tmp;
+		uint64_t tmp;
 		pipe->get_query_result(pipe, pq, 1, &tmp);
 	}
 
@@ -80,7 +80,7 @@ nv30_query_end(struct pipe_context *pipe, struct pipe_query *pq)
 
 static boolean
 nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
-		  boolean wait, uint64 *result)
+		  boolean wait, uint64_t *result)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 	struct nv30_query *q = nv30_query(pq);
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 40fed621b2..9480695d6e 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -49,7 +49,7 @@ nv30_state_emit(struct nv30_context *nv30)
 	struct nv30_state *state = &nv30->state;
 	struct nv30_screen *screen = nv30->screen;
 	unsigned i, samplers;
-	uint64 states;
+	uint64_t states;
 
 	if (nv30->pctx_id != screen->cur_pctx) {
 		for (i = 0; i < NV30_STATE_MAX; i++) {
diff --git a/src/gallium/drivers/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c
index 57f39cfab0..9b9a43f49d 100644
--- a/src/gallium/drivers/nv40/nv40_query.c
+++ b/src/gallium/drivers/nv40/nv40_query.c
@@ -50,7 +50,7 @@ nv40_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
 	 * the existing query to notify completion, but it could be better.
 	 */
 	if (q->object) {
-		uint64 tmp;
+		uint64_t tmp;
 		pipe->get_query_result(pipe, pq, 1, &tmp);
 	}
 
@@ -80,7 +80,7 @@ nv40_query_end(struct pipe_context *pipe, struct pipe_query *pq)
 
 static boolean
 nv40_query_result(struct pipe_context *pipe, struct pipe_query *pq,
-		  boolean wait, uint64 *result)
+		  boolean wait, uint64_t *result)
 {
 	struct nv40_context *nv40 = nv40_context(pipe);
 	struct nv40_query *q = nv40_query(pq);
diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
index ab88dc416e..52ec4c044b 100644
--- a/src/gallium/drivers/nv40/nv40_state_emit.c
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
@@ -65,7 +65,7 @@ nv40_state_emit(struct nv40_context *nv40)
 	struct nv40_state *state = &nv40->state;
 	struct nv40_screen *screen = nv40->screen;
 	unsigned i, samplers;
-	uint64 states;
+	uint64_t states;
 
 	if (nv40->pctx_id != screen->cur_pctx) {
 		for (i = 0; i < NV40_STATE_MAX; i++) {
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 26bd90ccc5..777e77906d 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -51,7 +51,7 @@ nv50_query_end(struct pipe_context *pipe, struct pipe_query *q)
 
 static boolean
 nv50_query_result(struct pipe_context *pipe, struct pipe_query *q,
-		  boolean wait, uint64 *result)
+		  boolean wait, uint64_t *result)
 {
 	NOUVEAU_ERR("unimplemented\n");
 	*result = 0xdeadcafe;
diff --git a/src/gallium/drivers/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h
index 7ab12a6d70..e2451c6ecb 100644
--- a/src/gallium/drivers/softpipe/sp_context.h
+++ b/src/gallium/drivers/softpipe/sp_context.h
@@ -94,7 +94,7 @@ struct softpipe_context {
    /* Counter for occlusion queries.  Note this supports overlapping
     * queries.
     */
-   uint64 occlusion_count;
+   uint64_t occlusion_count;
 
    /*
     * Mapped vertex buffers
diff --git a/src/gallium/drivers/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c
index 2106ee1d23..b0d8e01426 100644
--- a/src/gallium/drivers/softpipe/sp_query.c
+++ b/src/gallium/drivers/softpipe/sp_query.c
@@ -37,8 +37,8 @@
 #include "sp_query.h"
 
 struct softpipe_query {
-   uint64 start;
-   uint64 end;
+   uint64_t start;
+   uint64_t end;
 };
 
 
@@ -87,7 +87,7 @@ static boolean
 softpipe_get_query_result(struct pipe_context *pipe, 
 			  struct pipe_query *q,
 			  boolean wait,
-			  uint64 *result )
+			  uint64_t *result )
 {
    struct softpipe_query *sq = softpipe_query(q);
    *result = sq->end - sq->start;
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 1dd7719379..f0d51ad82e 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -274,11 +274,11 @@ static INLINE boolean
 trace_context_get_query_result(struct pipe_context *_pipe, 
                                struct pipe_query *query,
                                boolean wait,
-                               uint64 *presult)
+                               uint64_t *presult)
 {
    struct trace_context *tr_ctx = trace_context(_pipe);
    struct pipe_context *pipe = tr_ctx->pipe;
-   uint64 result;
+   uint64_t result;
    boolean _result;
 
    trace_dump_call_begin("pipe_context", "get_query_result");
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 02a075d384..bc2a0a7ef3 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -96,7 +96,6 @@ typedef int     _Bool;
 typedef unsigned int       uint;
 typedef unsigned char      ubyte;
 typedef unsigned short     ushort;
-typedef uint64_t           uint64;
 
 #if 0
 #define boolean bool
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 2646706ff2..166c6b6b7e 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -109,7 +109,7 @@ struct pipe_context {
    boolean (*get_query_result)(struct pipe_context *pipe, 
                                struct pipe_query *q,
                                boolean wait,
-                               uint64 *result);
+                               uint64_t *result);
    /*@}*/
 
    /**
-- 
cgit v1.2.3


From 2299f21f8da816fc4588492965e7dac422da1a96 Mon Sep 17 00:00:00 2001
From: Zack Rusin <zackr@vmware.com>
Date: Mon, 26 Jan 2009 14:49:54 -0500
Subject: gallium: standardize api on the prefix "nr"

---
 src/gallium/auxiliary/cso_cache/cso_context.c         | 2 +-
 src/gallium/auxiliary/util/u_blit.c                   | 4 ++--
 src/gallium/auxiliary/util/u_gen_mipmap.c             | 2 +-
 src/gallium/drivers/cell/ppu/cell_pipe_state.c        | 2 +-
 src/gallium/drivers/nv30/nv30_state_emit.c            | 2 +-
 src/gallium/drivers/nv30/nv30_state_fb.c              | 4 ++--
 src/gallium/drivers/nv40/nv40_state_emit.c            | 2 +-
 src/gallium/drivers/nv40/nv40_state_fb.c              | 4 ++--
 src/gallium/drivers/nv50/nv50_clear.c                 | 4 ++--
 src/gallium/drivers/nv50/nv50_state_validate.c        | 4 ++--
 src/gallium/drivers/softpipe/sp_clear.c               | 2 +-
 src/gallium/drivers/softpipe/sp_context.c             | 6 +++---
 src/gallium/drivers/softpipe/sp_flush.c               | 2 +-
 src/gallium/drivers/softpipe/sp_quad_blend.c          | 4 ++--
 src/gallium/drivers/softpipe/sp_quad_bufloop.c        | 4 ++--
 src/gallium/drivers/softpipe/sp_quad_colormask.c      | 2 +-
 src/gallium/drivers/softpipe/sp_quad_coverage.c       | 2 +-
 src/gallium/drivers/softpipe/sp_quad_output.c         | 2 +-
 src/gallium/drivers/softpipe/sp_setup.c               | 2 +-
 src/gallium/drivers/softpipe/sp_state_surface.c       | 2 +-
 src/gallium/drivers/trace/tr_context.c                | 4 ++--
 src/gallium/drivers/trace/tr_state.c                  | 2 +-
 src/gallium/include/pipe/p_state.h                    | 2 +-
 src/gallium/state_trackers/g3dvl/vl_basic_csc.c       | 2 +-
 src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c | 2 +-
 src/mesa/state_tracker/st_atom_framebuffer.c          | 6 +++---
 26 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'src/gallium/drivers/nv30/nv30_state_emit.c')

diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 68508f24de..a9157aad71 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -783,7 +783,7 @@ copy_framebuffer_state(struct pipe_framebuffer_state *dst,
 
    dst->width = src->width;
    dst->height = src->height;
-   dst->num_cbufs = src->num_cbufs;
+   dst->nr_cbufs = src->nr_cbufs;
    for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
       pipe_surface_reference(&dst->cbufs[i], src->cbufs[i]);
    }
diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 2cef3338b5..bc88086b5e 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -415,7 +415,7 @@ util_blit_pixels(struct blit_state *ctx,
    memset(&fb, 0, sizeof(fb));
    fb.width = dst->width;
    fb.height = dst->height;
-   fb.num_cbufs = 1;
+   fb.nr_cbufs = 1;
    fb.cbufs[0] = dst;
    cso_set_framebuffer(ctx->cso, &fb);
 
@@ -526,7 +526,7 @@ util_blit_pixels_tex(struct blit_state *ctx,
    memset(&fb, 0, sizeof(fb));
    fb.width = dst->width;
    fb.height = dst->height;
-   fb.num_cbufs = 1;
+   fb.nr_cbufs = 1;
    fb.cbufs[0] = dst;
    cso_set_framebuffer(ctx->cso, &fb);
 
diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index b5eb896b7a..cb9776ed95 100644
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -1490,7 +1490,7 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
 
    /* init framebuffer state */
    memset(&fb, 0, sizeof(fb));
-   fb.num_cbufs = 1;
+   fb.nr_cbufs = 1;
 
    /* set min/mag to same filter for faster sw speed */
    ctx->sampler.mag_img_filter = filter;
diff --git a/src/gallium/drivers/cell/ppu/cell_pipe_state.c b/src/gallium/drivers/cell/ppu/cell_pipe_state.c
index 81efd137c7..ca358ed031 100644
--- a/src/gallium/drivers/cell/ppu/cell_pipe_state.c
+++ b/src/gallium/drivers/cell/ppu/cell_pipe_state.c
@@ -307,7 +307,7 @@ cell_set_framebuffer_state(struct pipe_context *pipe,
        */
       cell->framebuffer.width = fb->width;
       cell->framebuffer.height = fb->height;
-      cell->framebuffer.num_cbufs = fb->num_cbufs;
+      cell->framebuffer.nr_cbufs = fb->nr_cbufs;
       for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
          pipe_surface_reference(&cell->framebuffer.cbufs[i], fb->cbufs[i]);
       }
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 9480695d6e..f77b08ff69 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -24,7 +24,7 @@ nv30_state_do_validate(struct nv30_context *nv30,
 	const struct pipe_framebuffer_state *fb = &nv30->framebuffer;
 	unsigned i;
 
-	for (i = 0; i < fb->num_cbufs; i++)
+	for (i = 0; i < fb->nr_cbufs; i++)
 		fb->cbufs[i]->status = PIPE_SURFACE_STATUS_DEFINED;
 	if (fb->zsbuf)
 		fb->zsbuf->status = PIPE_SURFACE_STATUS_DEFINED;
diff --git a/src/gallium/drivers/nv30/nv30_state_fb.c b/src/gallium/drivers/nv30/nv30_state_fb.c
index 73bdf7e56c..8536acc570 100644
--- a/src/gallium/drivers/nv30/nv30_state_fb.c
+++ b/src/gallium/drivers/nv30/nv30_state_fb.c
@@ -14,7 +14,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
 	unsigned h = fb->height;
 
 	rt_enable = 0;
-	for (i = 0; i < fb->num_cbufs; i++) {
+	for (i = 0; i < fb->nr_cbufs; i++) {
 		if (colour_format) {
 			assert(colour_format == fb->cbufs[i]->format);
 		} else {
@@ -34,7 +34,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
 
 	if (!(rt[0]->texture->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR)) {
 		assert(!(fb->width & (fb->width - 1)) && !(fb->height & (fb->height - 1)));
-		for (i = 1; i < fb->num_cbufs; i++)
+		for (i = 1; i < fb->nr_cbufs; i++)
 			assert(!(rt[i]->texture->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR));
 
 		/* FIXME: NV34TCL_RT_FORMAT_LOG2_[WIDTH/HEIGHT] */
diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
index 52ec4c044b..ce859def10 100644
--- a/src/gallium/drivers/nv40/nv40_state_emit.c
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
@@ -41,7 +41,7 @@ nv40_state_do_validate(struct nv40_context *nv40,
 	const struct pipe_framebuffer_state *fb = &nv40->framebuffer;
 	unsigned i;
 
-	for (i = 0; i < fb->num_cbufs; i++)
+	for (i = 0; i < fb->nr_cbufs; i++)
 		fb->cbufs[i]->status = PIPE_SURFACE_STATUS_DEFINED;
 	if (fb->zsbuf)
 		fb->zsbuf->status = PIPE_SURFACE_STATUS_DEFINED;
diff --git a/src/gallium/drivers/nv40/nv40_state_fb.c b/src/gallium/drivers/nv40/nv40_state_fb.c
index 28592d71c3..a2e09e18a4 100644
--- a/src/gallium/drivers/nv40/nv40_state_fb.c
+++ b/src/gallium/drivers/nv40/nv40_state_fb.c
@@ -14,7 +14,7 @@ nv40_state_framebuffer_validate(struct nv40_context *nv40)
 	unsigned h = fb->height;
 
 	rt_enable = 0;
-	for (i = 0; i < fb->num_cbufs; i++) {
+	for (i = 0; i < fb->nr_cbufs; i++) {
 		if (colour_format) {
 			assert(colour_format == fb->cbufs[i]->format);
 		} else {
@@ -35,7 +35,7 @@ nv40_state_framebuffer_validate(struct nv40_context *nv40)
 
 	if (!(rt[0]->texture->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR)) {
 		assert(!(fb->width & (fb->width - 1)) && !(fb->height & (fb->height - 1)));
-		for (i = 1; i < fb->num_cbufs; i++)
+		for (i = 1; i < fb->nr_cbufs; i++)
 			assert(!(rt[i]->texture->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR));
 
 		rt_format = NV40TCL_RT_FORMAT_TYPE_SWIZZLED |
diff --git a/src/gallium/drivers/nv50/nv50_clear.c b/src/gallium/drivers/nv50/nv50_clear.c
index a31a42d6b5..6380f397ea 100644
--- a/src/gallium/drivers/nv50/nv50_clear.c
+++ b/src/gallium/drivers/nv50/nv50_clear.c
@@ -39,10 +39,10 @@ nv50_clear(struct pipe_context *pipe, struct pipe_surface *ps,
 
 	if (ps->format == PIPE_FORMAT_Z24S8_UNORM ||
 	    ps->format == PIPE_FORMAT_Z16_UNORM) {
-		fb.num_cbufs = 0;
+		fb.nr_cbufs = 0;
 		fb.zsbuf = ps;
 	} else {
-		fb.num_cbufs = 1;
+		fb.nr_cbufs = 1;
 		fb.cbufs[0] = ps;
 		fb.zsbuf = NULL;
 	}
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index 198e25f448..4dc4c04493 100644
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -31,7 +31,7 @@ nv50_state_validate_fb(struct nv50_context *nv50)
 	struct pipe_framebuffer_state *fb = &nv50->framebuffer;
 	unsigned i, w, h, gw = 0;
 
-	for (i = 0; i < fb->num_cbufs; i++) {
+	for (i = 0; i < fb->nr_cbufs; i++) {
 		if (!gw) {
 			w = fb->cbufs[i]->width;
 			h = fb->cbufs[i]->height;
@@ -178,7 +178,7 @@ nv50_state_validate(struct nv50_context *nv50)
 	struct nouveau_stateobj *so;
 	unsigned i;
 
-	for (i = 0; i < fb->num_cbufs; i++)
+	for (i = 0; i < fb->nr_cbufs; i++)
 		fb->cbufs[i]->status = PIPE_SURFACE_STATUS_DEFINED;
 
 	if (fb->zsbuf)
diff --git a/src/gallium/drivers/softpipe/sp_clear.c b/src/gallium/drivers/softpipe/sp_clear.c
index dfa46c9fb7..ad108ec446 100644
--- a/src/gallium/drivers/softpipe/sp_clear.c
+++ b/src/gallium/drivers/softpipe/sp_clear.c
@@ -85,7 +85,7 @@ softpipe_clear(struct pipe_context *pipe, struct pipe_surface *ps,
 #endif
    }
 
-   for (i = 0; i < softpipe->framebuffer.num_cbufs; i++) {
+   for (i = 0; i < softpipe->framebuffer.nr_cbufs; i++) {
       if (ps == sp_tile_cache_get_surface(softpipe->cbuf_cache[i])) {
          unsigned cv;
          if (ps->format != PIPE_FORMAT_A8R8G8B8_UNORM) {
diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index 800f944838..d8a5631488 100644
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -57,7 +57,7 @@ softpipe_map_surfaces(struct softpipe_context *sp)
 {
    unsigned i;
 
-   for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
+   for (i = 0; i < sp->framebuffer.nr_cbufs; i++) {
       sp_tile_cache_map_surfaces(sp->cbuf_cache[i]);
    }
 
@@ -73,11 +73,11 @@ softpipe_unmap_surfaces(struct softpipe_context *sp)
 {
    uint i;
 
-   for (i = 0; i < sp->framebuffer.num_cbufs; i++)
+   for (i = 0; i < sp->framebuffer.nr_cbufs; i++)
       sp_flush_tile_cache(sp, sp->cbuf_cache[i]);
    sp_flush_tile_cache(sp, sp->zsbuf_cache);
 
-   for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
+   for (i = 0; i < sp->framebuffer.nr_cbufs; i++) {
       sp_tile_cache_unmap_surfaces(sp->cbuf_cache[i]);
    }
    sp_tile_cache_unmap_surfaces(sp->zsbuf_cache);
diff --git a/src/gallium/drivers/softpipe/sp_flush.c b/src/gallium/drivers/softpipe/sp_flush.c
index 401764bb43..c21faf57f3 100644
--- a/src/gallium/drivers/softpipe/sp_flush.c
+++ b/src/gallium/drivers/softpipe/sp_flush.c
@@ -57,7 +57,7 @@ softpipe_flush( struct pipe_context *pipe,
    }
 
    if (flags & PIPE_FLUSH_RENDER_CACHE) {
-      for (i = 0; i < softpipe->framebuffer.num_cbufs; i++)
+      for (i = 0; i < softpipe->framebuffer.nr_cbufs; i++)
          if (softpipe->cbuf_cache[i])
             sp_flush_tile_cache(softpipe, softpipe->cbuf_cache[i]);
 
diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c
index 6f64c6e584..fb1d430a4f 100644
--- a/src/gallium/drivers/softpipe/sp_quad_blend.c
+++ b/src/gallium/drivers/softpipe/sp_quad_blend.c
@@ -105,7 +105,7 @@ logicop_quad(struct quad_stage *qs, struct quad_header *quad)
    uint cbuf;
 
    /* loop over colorbuffer outputs */
-   for (cbuf = 0; cbuf < softpipe->framebuffer.num_cbufs; cbuf++) {
+   for (cbuf = 0; cbuf < softpipe->framebuffer.nr_cbufs; cbuf++) {
       float dest[4][QUAD_SIZE];
       ubyte src[4][4], dst[4][4], res[4][4];
       uint *src4 = (uint *) src;
@@ -239,7 +239,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
    }
 
    /* loop over colorbuffer outputs */
-   for (cbuf = 0; cbuf < softpipe->framebuffer.num_cbufs; cbuf++) {
+   for (cbuf = 0; cbuf < softpipe->framebuffer.nr_cbufs; cbuf++) {
       float source[4][QUAD_SIZE], dest[4][QUAD_SIZE];
       struct softpipe_cached_tile *tile
          = sp_get_cached_tile(softpipe,
diff --git a/src/gallium/drivers/softpipe/sp_quad_bufloop.c b/src/gallium/drivers/softpipe/sp_quad_bufloop.c
index 92e9af09c1..d7d6a6974d 100644
--- a/src/gallium/drivers/softpipe/sp_quad_bufloop.c
+++ b/src/gallium/drivers/softpipe/sp_quad_bufloop.c
@@ -17,7 +17,7 @@ cbuf_loop_quad(struct quad_stage *qs, struct quad_header *quad)
    unsigned i;
 
    assert(sizeof(quad->outputs.color) == sizeof(tmp));
-   assert(softpipe->framebuffer.num_cbufs <= PIPE_MAX_COLOR_BUFS);
+   assert(softpipe->framebuffer.nr_cbufs <= PIPE_MAX_COLOR_BUFS);
 
    /* make copy of original colors since they can get modified
     * by blending and masking.
@@ -28,7 +28,7 @@ cbuf_loop_quad(struct quad_stage *qs, struct quad_header *quad)
     */
    memcpy(tmp, quad->outputs.color, sizeof(tmp));
 
-   for (i = 0; i < softpipe->framebuffer.num_cbufs; i++) {
+   for (i = 0; i < softpipe->framebuffer.nr_cbufs; i++) {
       /* set current cbuffer */
 #if 0 /* obsolete & going away */
       softpipe->current_cbuf = i;
diff --git a/src/gallium/drivers/softpipe/sp_quad_colormask.c b/src/gallium/drivers/softpipe/sp_quad_colormask.c
index f32bdfab78..563c2fc739 100644
--- a/src/gallium/drivers/softpipe/sp_quad_colormask.c
+++ b/src/gallium/drivers/softpipe/sp_quad_colormask.c
@@ -51,7 +51,7 @@ colormask_quad(struct quad_stage *qs, struct quad_header *quad)
    uint cbuf;
 
    /* loop over colorbuffer outputs */
-   for (cbuf = 0; cbuf < softpipe->framebuffer.num_cbufs; cbuf++) {
+   for (cbuf = 0; cbuf < softpipe->framebuffer.nr_cbufs; cbuf++) {
       float dest[4][QUAD_SIZE];
       struct softpipe_cached_tile *tile
          = sp_get_cached_tile(softpipe,
diff --git a/src/gallium/drivers/softpipe/sp_quad_coverage.c b/src/gallium/drivers/softpipe/sp_quad_coverage.c
index ee29aa7dfe..c27fd1482d 100644
--- a/src/gallium/drivers/softpipe/sp_quad_coverage.c
+++ b/src/gallium/drivers/softpipe/sp_quad_coverage.c
@@ -53,7 +53,7 @@ coverage_quad(struct quad_stage *qs, struct quad_header *quad)
       uint cbuf;
 
       /* loop over colorbuffer outputs */
-      for (cbuf = 0; cbuf < softpipe->framebuffer.num_cbufs; cbuf++) {
+      for (cbuf = 0; cbuf < softpipe->framebuffer.nr_cbufs; cbuf++) {
          float (*quadColor)[4] = quad->output.color[cbuf];
          unsigned j;
          for (j = 0; j < QUAD_SIZE; j++) {
diff --git a/src/gallium/drivers/softpipe/sp_quad_output.c b/src/gallium/drivers/softpipe/sp_quad_output.c
index b7aac7f84a..a37c8b4c39 100644
--- a/src/gallium/drivers/softpipe/sp_quad_output.c
+++ b/src/gallium/drivers/softpipe/sp_quad_output.c
@@ -48,7 +48,7 @@ output_quad(struct quad_stage *qs, struct quad_header *quad)
    uint cbuf;
 
    /* loop over colorbuffer outputs */
-   for (cbuf = 0; cbuf < softpipe->framebuffer.num_cbufs; cbuf++) {
+   for (cbuf = 0; cbuf < softpipe->framebuffer.nr_cbufs; cbuf++) {
       struct softpipe_cached_tile *tile
          = sp_get_cached_tile(softpipe,
                               softpipe->cbuf_cache[cbuf],
diff --git a/src/gallium/drivers/softpipe/sp_setup.c b/src/gallium/drivers/softpipe/sp_setup.c
index 13d8017393..b1adb9cb7a 100644
--- a/src/gallium/drivers/softpipe/sp_setup.c
+++ b/src/gallium/drivers/softpipe/sp_setup.c
@@ -1497,7 +1497,7 @@ void setup_prepare( struct setup_context *setup )
    }
 
    /* Mark surfaces as defined now */
-   for (i = 0; i < sp->framebuffer.num_cbufs; i++){
+   for (i = 0; i < sp->framebuffer.nr_cbufs; i++){
       if (sp->framebuffer.cbufs[i]) {
          sp->framebuffer.cbufs[i]->status = PIPE_SURFACE_STATUS_DEFINED;
       }
diff --git a/src/gallium/drivers/softpipe/sp_state_surface.c b/src/gallium/drivers/softpipe/sp_state_surface.c
index b5376e522d..1493c65884 100644
--- a/src/gallium/drivers/softpipe/sp_state_surface.c
+++ b/src/gallium/drivers/softpipe/sp_state_surface.c
@@ -64,7 +64,7 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
       }
    }
 
-   sp->framebuffer.num_cbufs = fb->num_cbufs;
+   sp->framebuffer.nr_cbufs = fb->nr_cbufs;
 
    /* zbuf changing? */
    if (sp->framebuffer.zsbuf != fb->zsbuf) {
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index f0d51ad82e..ec8be27077 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -722,9 +722,9 @@ trace_context_set_framebuffer_state(struct pipe_context *_pipe,
    
    /* Unwrap the input state */
    memcpy(&unwrapped_state, state, sizeof(unwrapped_state));
-   for(i = 0; i < state->num_cbufs; ++i)
+   for(i = 0; i < state->nr_cbufs; ++i)
       unwrapped_state.cbufs[i] = trace_surface_unwrap(tr_ctx, state->cbufs[i]);
-   for(i = state->num_cbufs; i < PIPE_MAX_COLOR_BUFS; ++i)
+   for(i = state->nr_cbufs; i < PIPE_MAX_COLOR_BUFS; ++i)
       unwrapped_state.cbufs[i] = NULL;
    unwrapped_state.zsbuf = trace_surface_unwrap(tr_ctx, state->zsbuf);
    state = &unwrapped_state;
diff --git a/src/gallium/drivers/trace/tr_state.c b/src/gallium/drivers/trace/tr_state.c
index 8b147a8d37..155f1cb859 100644
--- a/src/gallium/drivers/trace/tr_state.c
+++ b/src/gallium/drivers/trace/tr_state.c
@@ -351,7 +351,7 @@ void trace_dump_framebuffer_state(const struct pipe_framebuffer_state *state)
 
    trace_dump_member(uint, state, width);
    trace_dump_member(uint, state, height);
-   trace_dump_member(uint, state, num_cbufs);
+   trace_dump_member(uint, state, nr_cbufs);
    trace_dump_member_array(ptr, state, cbufs);
    trace_dump_member(ptr, state, zsbuf);
 
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 0a0ca770da..1f4dc3f7dc 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -241,7 +241,7 @@ struct pipe_framebuffer_state
    unsigned width, height;
 
    /** multiple colorbuffers for multiple render targets */
-   unsigned num_cbufs;
+   unsigned nr_cbufs;
    struct pipe_surface *cbufs[PIPE_MAX_COLOR_BUFS];
 
    struct pipe_surface *zsbuf;      /**< Z/stencil buffer */
diff --git a/src/gallium/state_trackers/g3dvl/vl_basic_csc.c b/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
index da119ff1bd..53ef275349 100644
--- a/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
+++ b/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
@@ -657,7 +657,7 @@ static int vlInit
 	csc->framebuffer_tex = NULL;
 	csc->framebuffer.width = 0;
 	csc->framebuffer.height = 0;
-	csc->framebuffer.num_cbufs = 1;
+	csc->framebuffer.nr_cbufs = 1;
 	csc->framebuffer.cbufs[0] = NULL;
 	csc->framebuffer.zsbuf = NULL;
 
diff --git a/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c b/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
index f0f8294473..789042f6f2 100644
--- a/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
+++ b/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
@@ -1052,7 +1052,7 @@ static int vlInit
 
 	mc->render_target.width = vlRoundUpPOT(mc->picture_width);
 	mc->render_target.height = vlRoundUpPOT(mc->picture_height);
-	mc->render_target.num_cbufs = 1;
+	mc->render_target.nr_cbufs = 1;
 	/* FB for MC stage is a vlSurface created by the user, set at render time */
 	mc->render_target.zsbuf = NULL;
 
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 902bdf94f2..625efdd66b 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -108,7 +108,7 @@ update_framebuffer_state( struct st_context *st )
    /* Examine Mesa's ctx->DrawBuffer->_ColorDrawBuffers state
     * to determine which surfaces to draw to
     */
-   framebuffer->num_cbufs = 0;
+   framebuffer->nr_cbufs = 0;
    for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
       strb = st_renderbuffer(fb->_ColorDrawBuffers[i]);
 
@@ -119,8 +119,8 @@ update_framebuffer_state( struct st_context *st )
       }
 
       if (strb->surface) {
-         framebuffer->cbufs[framebuffer->num_cbufs] = strb->surface;
-         framebuffer->num_cbufs++;
+         framebuffer->cbufs[framebuffer->nr_cbufs] = strb->surface;
+         framebuffer->nr_cbufs++;
       }
    }
 
-- 
cgit v1.2.3