r300-gallium: Fix CS count in fb state emit.

[mesa.git] / src / gallium / drivers / r300 / r300_emit.c

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index da5f2058c50079d418c19244f59fc1120c83e2e8..4ffd92c9dc3cb14c9f8ea84106ee7ed4ad2f7e6e 100644 (file)
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -160,7 +160,7 @@ void r300_emit_fb_state(struct r300_context* r300,
     struct r300_texture* tex;
     int i;
 
-    BEGIN_CS((6 * fb->nr_cbufs) + (fb->zsbuf ? 5 : 0) + 4);
+    BEGIN_CS((6 * fb->nr_cbufs) + (fb->zsbuf ? 6 : 0) + 4);
     for (i = 0; i < fb->nr_cbufs; i++) {
         tex = (struct r300_texture*)fb->cbufs[i]->texture;
         OUT_CS_REG_SEQ(R300_RB3D_COLOROFFSET0 + (4 * i), 1);
@@ -193,7 +193,6 @@ void r300_emit_fb_state(struct r300_context* r300,
 
 void r300_emit_rs_state(struct r300_context* r300, struct r300_rs_state* rs)
 {
-    struct r300_screen* r300screen = r300_screen(r300->context.screen);
     CS_LOCALS(r300);
 
     BEGIN_CS(20);
@@ -248,6 +247,18 @@ void r300_emit_rs_block_state(struct r300_context* r300,
     END_CS;
 }
 
+void r300_emit_sampler(struct r300_context* r300,
+                       struct r300_sampler_state* sampler, unsigned offset)
+{
+    CS_LOCALS(r300);
+
+    BEGIN_CS(6);
+    OUT_CS_REG(R300_TX_FILTER0_0 + (offset * 4), sampler->filter0);
+    OUT_CS_REG(R300_TX_FILTER1_0 + (offset * 4), sampler->filter1);
+    OUT_CS_REG(R300_TX_BORDER_COLOR_0 + (offset * 4), sampler->border_color);
+    END_CS;
+}
+
 void r300_emit_scissor_state(struct r300_context* r300,
                              struct r300_scissor_state* scissor)
 {
@@ -260,6 +271,21 @@ void r300_emit_scissor_state(struct r300_context* r300,
     END_CS;
 }
 
+void r300_emit_texture(struct r300_context* r300,
+                       struct r300_texture* tex, unsigned offset)
+{
+    CS_LOCALS(r300);
+
+    BEGIN_CS(8);
+    OUT_CS_REG(R300_TX_FORMAT0_0 + (offset * 4), tex->state.format0);
+    OUT_CS_REG(R300_TX_FORMAT1_0 + (offset * 4), tex->state.format1);
+    OUT_CS_REG(R300_TX_FORMAT2_0 + (offset * 4), tex->state.format2);
+    OUT_CS_REG_SEQ(R300_TX_OFFSET_0 + (offset * 4), 1);
+    OUT_CS_RELOC(tex->buffer, 0, 0, RADEON_GEM_DOMAIN_GTT |
+            RADEON_GEM_DOMAIN_VRAM, 0);
+    END_CS;
+}
+
 void r300_emit_vertex_format_state(struct r300_context* r300)
 {
     CS_LOCALS(r300);
@@ -286,11 +312,21 @@ void r300_emit_vertex_format_state(struct r300_context* r300)
     END_CS;
 }
 
+static void r300_flush_textures(struct r300_context* r300)
+{
+    CS_LOCALS(r300);
+
+    BEGIN_CS(4);
+    OUT_CS_REG(R300_TX_INVALTAGS, 0);
+    OUT_CS_REG(R300_TX_ENABLE, (1 << r300->texture_count) - 1);
+    END_CS;
+}
+
 /* Emit all dirty state. */
 void r300_emit_dirty_state(struct r300_context* r300)
 {
     struct r300_screen* r300screen = r300_screen(r300->context.screen);
-    CS_LOCALS(r300);
+    int i;
 
     if (!(r300->dirty_state) && !(r300->dirty_hw)) {
         return;
@@ -341,11 +377,31 @@ void r300_emit_dirty_state(struct r300_context* r300)
         r300->dirty_state &= ~R300_NEW_RS_BLOCK;
     }
 
+    if (r300->dirty_state & R300_ANY_NEW_SAMPLERS) {
+        for (i = 0; i < r300->sampler_count; i++) {
+            if (r300->dirty_state & (R300_NEW_SAMPLER << i)) {
+                r300_emit_sampler(r300, r300->sampler_states[i], i);
+                r300->dirty_state &= ~(R300_NEW_SAMPLER << i);
+            }
+            r300_flush_textures(r300);
+        }
+    }
+
     if (r300->dirty_state & R300_NEW_SCISSOR) {
         r300_emit_scissor_state(r300, r300->scissor_state);
         r300->dirty_state &= ~R300_NEW_SCISSOR;
     }
 
+    if (r300->dirty_state & R300_ANY_NEW_TEXTURES) {
+        for (i = 0; i < r300->texture_count; i++) {
+            if (r300->dirty_state & (R300_NEW_TEXTURE << i)) {
+                r300_emit_texture(r300, r300->textures[i], i);
+                r300->dirty_state &= ~(R300_NEW_TEXTURE << i);
+            }
+            r300_flush_textures(r300);
+        }
+    }
+
     if (r300->dirty_state & R300_NEW_VERTEX_FORMAT) {
         r300_emit_vertex_format_state(r300);
         r300->dirty_state &= ~R300_NEW_VERTEX_FORMAT;