From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Thu, 14 May 2009 00:01:03 +0000 (-0700)
Subject: r300-gallium: Space accounting for textures.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15601e970250e12f5d566ba782aae06d9714fbdc;p=mesa.git

r300-gallium: Space accounting for textures.
---

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index c73d5a0b443..cd5c38a0c7d 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -460,7 +460,6 @@ void r300_emit_dirty_state(struct r300_context* r300)
     for (i = 0; i < r300->framebuffer_state.nr_cbufs; i++) {
         tex = (struct r300_texture*)r300->framebuffer_state.cbufs[i]->texture;
         assert(tex && tex->buffer && "cbuf is marked, but NULL!");
-        if (!tex->buffer) return;
         r300->winsys->add_buffer(r300->winsys, tex->buffer,
                 0, RADEON_GEM_DOMAIN_VRAM);
     }
@@ -468,10 +467,16 @@ void r300_emit_dirty_state(struct r300_context* r300)
     if (r300->framebuffer_state.zsbuf) {
         tex = (struct r300_texture*)r300->framebuffer_state.zsbuf->texture;
         assert(tex && tex->buffer && "zsbuf is marked, but NULL!");
-        if (!tex->buffer) return;
         r300->winsys->add_buffer(r300->winsys, tex->buffer,
                 0, RADEON_GEM_DOMAIN_VRAM);
     }
+    /* ...textures... */
+    for (i = 0; i < r300->texture_count; i++) {
+        tex = r300->textures[i];
+        assert(tex && tex->buffer && "zsbuf is marked, but NULL!");
+        r300->winsys->add_buffer(r300->winsys, tex->buffer,
+                RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
+    }
     /* ...and vertex buffer. */
     if (r300->vbo) {
         r300->winsys->add_buffer(r300->winsys, r300->vbo,