r600g: track dirty registers better. (v2)

[mesa.git] / src / gallium / drivers / r600 / r600_blit.c

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 1a1908031f0b7439d773b62e7e0065930f876373..04408a5cc8eb434aa5aed9dd601bb064829cb8fb 100644 (file)
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -54,7 +54,9 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op
        if (rctx->states[R600_PIPE_STATE_CLIP]) {
                util_blitter_save_clip(rctx->blitter, &rctx->clip);
        }
-       util_blitter_save_vertex_buffers(rctx->blitter, rctx->nvertex_buffers, rctx->vertex_buffer);
+       util_blitter_save_vertex_buffers(rctx->blitter,
+                                        rctx->vbuf_mgr->nr_vertex_buffers,
+                                        rctx->vbuf_mgr->vertex_buffer);
 
        if (op & (R600_CLEAR_SURFACE | R600_COPY))
                util_blitter_save_framebuffer(rctx->blitter, &rctx->framebuffer);
@@ -88,13 +90,13 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_t
        if (!texture->dirty_db)
                return;
 
-       surf_tmpl.format = texture->resource.base.b.format;
+       surf_tmpl.format = texture->resource.b.b.b.format;
        surf_tmpl.u.tex.level = level;
        surf_tmpl.u.tex.first_layer = 0;
        surf_tmpl.u.tex.last_layer = 0;
        surf_tmpl.usage = PIPE_BIND_DEPTH_STENCIL;
 
-       zsurf = ctx->create_surface(ctx, &texture->resource.base.b, &surf_tmpl);
+       zsurf = ctx->create_surface(ctx, &texture->resource.b.b.b, &surf_tmpl);
 
        surf_tmpl.format = ((struct pipe_resource*)texture->flushed_depth_texture)->format;
        surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
@@ -134,6 +136,9 @@ void r600_flush_depth_textures(struct r600_pipe_context *rctx)
                if (!tex->depth)
                        continue;
 
+               if (tex->is_flushing_texture)
+                       continue;
+
                r600_blit_uncompress_depth(&rctx->context, tex);
        }
 
@@ -145,6 +150,9 @@ void r600_flush_depth_textures(struct r600_pipe_context *rctx)
                if (!tex->depth)
                        continue;
 
+               if (tex->is_flushing_texture)
+                       continue;
+
                r600_blit_uncompress_depth(&rctx->context, tex);
        }
 }
@@ -211,6 +219,52 @@ static void r600_hw_copy_region(struct pipe_context *ctx,
        r600_blitter_end(ctx);
 }
 
+struct texture_orig_info {
+       unsigned format;
+       unsigned width0;
+       unsigned height0;
+};
+
+static void r600_compressed_to_blittable(struct pipe_resource *tex,
+                                  unsigned level,
+                                  struct texture_orig_info *orig)
+{
+       struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
+       unsigned pixsize = util_format_get_blocksize(tex->format);
+       int new_format;
+       int new_height, new_width;
+
+       orig->format = tex->format;
+       orig->width0 = tex->width0;
+       orig->height0 = tex->height0;
+
+       if (pixsize == 8)
+               new_format = PIPE_FORMAT_R16G16B16A16_UNORM; /* 64-bit block */
+       else
+               new_format = PIPE_FORMAT_R32G32B32A32_UNORM; /* 128-bit block */
+
+       new_width = util_format_get_nblocksx(tex->format, orig->width0);
+       new_height = util_format_get_nblocksy(tex->format, orig->height0);
+
+       rtex->force_int_type = true;
+       tex->width0 = new_width;
+       tex->height0 = new_height;
+       tex->format = new_format;
+
+}
+
+static void r600_reset_blittable_to_compressed(struct pipe_resource *tex,
+                                        unsigned level,
+                                        struct texture_orig_info *orig)
+{
+       struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
+       rtex->force_int_type = false;
+
+       tex->format = orig->format;
+       tex->width0 = orig->width0;
+       tex->height0 = orig->height0;
+}
+
 static void r600_resource_copy_region(struct pipe_context *ctx,
                                      struct pipe_resource *dst,
                                      unsigned dst_level,
@@ -220,13 +274,35 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
                                      const struct pipe_box *src_box)
 {
        struct r600_resource_texture *rsrc = (struct r600_resource_texture*)src;
+       struct texture_orig_info orig_info[2];
+       boolean restore_orig[2];
 
        if (rsrc->depth && !rsrc->is_flushing_texture)
-               r600_texture_depth_flush(ctx, src);
+               r600_texture_depth_flush(ctx, src, FALSE);
+
+       restore_orig[0] = restore_orig[1] = FALSE;
+
+       if (util_format_is_compressed(src->format)) {
+               r600_compressed_to_blittable(src, src_level, &orig_info[0]);
+               restore_orig[0] = TRUE;
+       }
+
+       if (util_format_is_compressed(dst->format)) {
+               r600_compressed_to_blittable(dst, dst_level, &orig_info[1]);
+               restore_orig[1] = TRUE;
+               /* translate the dst box as well */
+               dstx = util_format_get_nblocksx(orig_info[1].format, dstx);
+               dsty = util_format_get_nblocksy(orig_info[1].format, dsty);
+       }
 
        r600_hw_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
                            src, src_level, src_box);
 
+       if (restore_orig[0])
+               r600_reset_blittable_to_compressed(src, src_level, &orig_info[0]);
+
+       if (restore_orig[1])
+               r600_reset_blittable_to_compressed(dst, dst_level, &orig_info[1]);
 }
 
 void r600_init_blit_functions(struct r600_pipe_context *rctx)
@@ -239,15 +315,11 @@ void r600_init_blit_functions(struct r600_pipe_context *rctx)
 
 void r600_blit_push_depth(struct pipe_context *ctx, struct r600_resource_texture *texture)
 {
-       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
-       struct pipe_surface *zsurf, *cbsurf, surf_tmpl;
-       int level = 0;
-       float depth = 1.0f;
        struct pipe_box sbox;
 
        sbox.x = sbox.y = sbox.z = 0;
-       sbox.width = texture->resource.base.b.width0;
-       sbox.height = texture->resource.base.b.height0;
+       sbox.width = texture->resource.b.b.b.width0;
+       sbox.height = texture->resource.b.b.b.height0;
        /* XXX that might be wrong */
        sbox.depth = 1;