r600g: Get rid of leftover PB_USAGE_* flags.

[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 04408a5cc8eb434aa5aed9dd601bb064829cb8fb..35e68b6e222e67112e9075c431fa87226c87cc60 100644 (file)
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -27,9 +27,18 @@
 
 enum r600_blitter_op /* bitmask */
 {
-       R600_CLEAR         = 1,
-       R600_CLEAR_SURFACE = 2,
-       R600_COPY          = 4
+       R600_SAVE_TEXTURES      = 1,
+       R600_SAVE_FRAMEBUFFER   = 2,
+       R600_DISABLE_RENDER_COND = 4,
+
+       R600_CLEAR         = 0,
+
+       R600_CLEAR_SURFACE = R600_SAVE_FRAMEBUFFER,
+
+       R600_COPY          = R600_SAVE_FRAMEBUFFER | R600_SAVE_TEXTURES |
+                            R600_DISABLE_RENDER_COND,
+
+       R600_DECOMPRESS    = R600_SAVE_FRAMEBUFFER | R600_DISABLE_RENDER_COND,
 };
 
 static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op)
@@ -58,10 +67,10 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op
                                         rctx->vbuf_mgr->nr_vertex_buffers,
                                         rctx->vbuf_mgr->vertex_buffer);
 
-       if (op & (R600_CLEAR_SURFACE | R600_COPY))
+       if (op & R600_SAVE_FRAMEBUFFER)
                util_blitter_save_framebuffer(rctx->blitter, &rctx->framebuffer);
 
-       if (op & R600_COPY) {
+       if (op & R600_SAVE_TEXTURES) {
                util_blitter_save_fragment_sampler_states(
                        rctx->blitter, rctx->ps_samplers.n_samplers,
                        (void**)rctx->ps_samplers.samplers);
@@ -71,12 +80,24 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op
                        (struct pipe_sampler_view**)rctx->ps_samplers.views);
        }
 
+       if ((op & R600_DISABLE_RENDER_COND) && rctx->current_render_cond) {
+               rctx->saved_render_cond = rctx->current_render_cond;
+               rctx->saved_render_cond_mode = rctx->current_render_cond_mode;
+               rctx->context.render_condition(&rctx->context, NULL, 0);
+       }
+
 }
 
 static void r600_blitter_end(struct pipe_context *ctx)
 {
        struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
-       r600_context_queries_resume(&rctx->ctx);
+       if (rctx->saved_render_cond) {
+               rctx->context.render_condition(&rctx->context,
+                                              rctx->saved_render_cond,
+                                              rctx->saved_render_cond_mode);
+               rctx->saved_render_cond = NULL;
+       }
+       r600_context_queries_resume(&rctx->ctx, FALSE);
        rctx->blit = false;
 }
 
@@ -107,7 +128,7 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_t
            rctx->family == CHIP_RV620 || rctx->family == CHIP_RV635)
                depth = 0.0f;
 
-       r600_blitter_begin(ctx, R600_CLEAR_SURFACE);
+       r600_blitter_begin(ctx, R600_DECOMPRESS);
        util_blitter_custom_depth_stencil(rctx->blitter, zsurf, cbsurf, rctx->custom_dsa_flush, depth);
        r600_blitter_end(ctx);
 
@@ -121,8 +142,6 @@ void r600_flush_depth_textures(struct r600_pipe_context *rctx)
 {
        unsigned int i;
 
-       if (rctx->blit) return;
-
        /* FIXME: This handles fragment shader textures only. */
 
        for (i = 0; i < rctx->ps_samplers.n_views; ++i) {
@@ -275,8 +294,17 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
 {
        struct r600_resource_texture *rsrc = (struct r600_resource_texture*)src;
        struct texture_orig_info orig_info[2];
+       struct pipe_box sbox;
+       const struct pipe_box *psbox;
        boolean restore_orig[2];
 
+       /* Fallback for buffers. */
+       if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
+               util_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
+                                          src, src_level, src_box);
+               return;
+       }
+
        if (rsrc->depth && !rsrc->is_flushing_texture)
                r600_texture_depth_flush(ctx, src, FALSE);
 
@@ -285,7 +313,15 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
        if (util_format_is_compressed(src->format)) {
                r600_compressed_to_blittable(src, src_level, &orig_info[0]);
                restore_orig[0] = TRUE;
-       }
+               sbox.x = util_format_get_nblocksx(orig_info[0].format, src_box->x);
+               sbox.y = util_format_get_nblocksy(orig_info[0].format, src_box->y);
+               sbox.z = src_box->z;
+               sbox.width = util_format_get_nblocksx(orig_info[0].format, src_box->width);
+               sbox.height = util_format_get_nblocksy(orig_info[0].format, src_box->height);
+               sbox.depth = src_box->depth;
+               psbox=&sbox;
+       } else
+               psbox=src_box;
 
        if (util_format_is_compressed(dst->format)) {
                r600_compressed_to_blittable(dst, dst_level, &orig_info[1]);
@@ -296,7 +332,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
        }
 
        r600_hw_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
-                           src, src_level, src_box);
+                           src, src_level, psbox);
 
        if (restore_orig[0])
                r600_reset_blittable_to_compressed(src, src_level, &orig_info[0]);