nouveau: match gallium code reorginisation.

That was... fun..

1 files changed, 77 insertions, 0 deletions

diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
new file mode 100644
index 00000000000..a10c9955480
--- /dev/null
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
@@ -0,0 +1,77 @@
+#include "nv40_context.h"
+#include "nv40_state.h"
+
+/* Emit relocs for every referenced buffer.
+ *
+ * This is to ensure the bufmgr has an accurate idea of how
+ * the buffer is used.  These relocs appear in the push buffer as
+ * NOPs, and will only be turned into state changes if a buffer
+ * actually moves.
+ */
+static void
+nv40_state_emit_dummy_relocs(struct nv40_context *nv40)
+{
+	unsigned i;	
+	
+	so_emit_reloc_markers(nv40->nvws, nv40->so_framebuffer);
+	for (i = 0; i < 16; i++) {
+		if (!(nv40->fp_samplers & (1 << i)))
+			continue;
+		so_emit_reloc_markers(nv40->nvws, nv40->so_fragtex[i]);
+	}
+	so_emit_reloc_markers(nv40->nvws, nv40->fragprog.active->so);
+}
+
+void
+nv40_emit_hw_state(struct nv40_context *nv40)
+{
+	if (nv40->dirty & NV40_NEW_FB)
+		so_emit(nv40->nvws, nv40->so_framebuffer);
+
+	if (nv40->dirty & NV40_NEW_BLEND)
+		so_emit(nv40->nvws, nv40->so_blend);
+
+	if (nv40->dirty & NV40_NEW_RAST)
+		so_emit(nv40->nvws, nv40->so_rast);
+
+	if (nv40->dirty & NV40_NEW_ZSA)
+		so_emit(nv40->nvws, nv40->so_zsa);
+
+	if (nv40->dirty & NV40_NEW_BCOL)
+		so_emit(nv40->nvws, nv40->so_bcol);
+
+	if (nv40->dirty & NV40_NEW_SCISSOR)
+		so_emit(nv40->nvws, nv40->so_scissor);
+
+	if (nv40->dirty & NV40_NEW_VIEWPORT)
+		so_emit(nv40->nvws, nv40->so_viewport);
+
+	if (nv40->dirty & NV40_NEW_STIPPLE)
+		so_emit(nv40->nvws, nv40->so_stipple);
+
+	if (nv40->dirty & NV40_NEW_FRAGPROG) {
+		nv40_fragprog_bind(nv40, nv40->fragprog.current);
+		/*XXX: clear NV40_NEW_FRAGPROG if no new program uploaded */
+	}
+
+	if (nv40->dirty_samplers || (nv40->dirty & NV40_NEW_FRAGPROG)) {
+		nv40_fragtex_bind(nv40);
+
+		BEGIN_RING(curie, NV40TCL_TEX_CACHE_CTL, 1);
+		OUT_RING  (2);
+		BEGIN_RING(curie, NV40TCL_TEX_CACHE_CTL, 1);
+		OUT_RING  (1);
+		nv40->dirty &= ~NV40_NEW_FRAGPROG;
+	}
+
+	if (nv40->dirty & NV40_NEW_VERTPROG) {
+		nv40_vertprog_bind(nv40, nv40->vertprog.current);
+		nv40->dirty &= ~NV40_NEW_VERTPROG;
+	}
+
+	nv40->dirty_samplers = 0;
+	nv40->dirty = 0;
+
+	nv40_state_emit_dummy_relocs(nv40);
+}
+