radeonsi: remove r600_pipe_common::decompress_dcc
[mesa.git] / src / gallium / drivers / radeonsi / si_blit.c
index 631676bcd799915cc58a698498fec62e88f78208..27221714a40ea0591e3efa3f966bcfe1e234fe4c 100644 (file)
 #include "si_pipe.h"
 #include "si_compute.h"
 #include "util/u_format.h"
+#include "util/u_log.h"
 #include "util/u_surface.h"
 
-enum si_blitter_op /* bitmask */
-{
-       SI_SAVE_TEXTURES      = 1,
-       SI_SAVE_FRAMEBUFFER   = 2,
-       SI_SAVE_FRAGMENT_STATE = 4,
-       SI_DISABLE_RENDER_COND = 8,
-
-       SI_CLEAR         = SI_SAVE_FRAGMENT_STATE,
-
-       SI_CLEAR_SURFACE = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE,
-
+enum {
        SI_COPY          = SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES |
                           SI_SAVE_FRAGMENT_STATE | SI_DISABLE_RENDER_COND,
 
@@ -49,18 +40,16 @@ enum si_blitter_op /* bitmask */
        SI_COLOR_RESOLVE = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE
 };
 
-static void si_blitter_begin(struct pipe_context *ctx, enum si_blitter_op op)
+void si_blitter_begin(struct pipe_context *ctx, enum si_blitter_op op)
 {
        struct si_context *sctx = (struct si_context *)ctx;
 
-       util_blitter_save_vertex_buffer_slot(sctx->blitter, sctx->vertex_buffer);
-       util_blitter_save_vertex_elements(sctx->blitter, sctx->vertex_elements);
        util_blitter_save_vertex_shader(sctx->blitter, sctx->vs_shader.cso);
        util_blitter_save_tessctrl_shader(sctx->blitter, sctx->tcs_shader.cso);
        util_blitter_save_tesseval_shader(sctx->blitter, sctx->tes_shader.cso);
        util_blitter_save_geometry_shader(sctx->blitter, sctx->gs_shader.cso);
-       util_blitter_save_so_targets(sctx->blitter, sctx->b.streamout.num_targets,
-                                    (struct pipe_stream_output_target**)sctx->b.streamout.targets);
+       util_blitter_save_so_targets(sctx->blitter, sctx->streamout.num_targets,
+                                    (struct pipe_stream_output_target**)sctx->streamout.targets);
        util_blitter_save_rasterizer(sctx->blitter, sctx->queued.named.rasterizer);
 
        if (op & SI_SAVE_FRAGMENT_STATE) {
@@ -69,8 +58,7 @@ static void si_blitter_begin(struct pipe_context *ctx, enum si_blitter_op op)
                util_blitter_save_stencil_ref(sctx->blitter, &sctx->stencil_ref.state);
                util_blitter_save_fragment_shader(sctx->blitter, sctx->ps_shader.cso);
                util_blitter_save_sample_mask(sctx->blitter, sctx->sample_mask.sample_mask);
-               util_blitter_save_viewport(sctx->blitter, &sctx->b.viewports.states[0]);
-               util_blitter_save_scissor(sctx->blitter, &sctx->b.scissors.states[0]);
+               util_blitter_save_scissor(sctx->blitter, &sctx->scissors.states[0]);
        }
 
        if (op & SI_SAVE_FRAMEBUFFER)
@@ -79,21 +67,27 @@ static void si_blitter_begin(struct pipe_context *ctx, enum si_blitter_op op)
        if (op & SI_SAVE_TEXTURES) {
                util_blitter_save_fragment_sampler_states(
                        sctx->blitter, 2,
-                       (void**)sctx->samplers[PIPE_SHADER_FRAGMENT].views.sampler_states);
+                       (void**)sctx->samplers[PIPE_SHADER_FRAGMENT].sampler_states);
 
                util_blitter_save_fragment_sampler_views(sctx->blitter, 2,
-                       sctx->samplers[PIPE_SHADER_FRAGMENT].views.views);
+                       sctx->samplers[PIPE_SHADER_FRAGMENT].views);
        }
 
        if (op & SI_DISABLE_RENDER_COND)
                sctx->b.render_cond_force_off = true;
 }
 
-static void si_blitter_end(struct pipe_context *ctx)
+void si_blitter_end(struct pipe_context *ctx)
 {
        struct si_context *sctx = (struct si_context *)ctx;
 
        sctx->b.render_cond_force_off = false;
+
+       /* Restore shader pointers because the VS blit shader changed all
+        * non-global VS user SGPRs. */
+       sctx->shader_pointers_dirty |= SI_DESCS_SHADER_MASK(VERTEX);
+       sctx->vertex_buffer_pointer_dirty = sctx->vb_descriptors_buffer != NULL;
+       si_mark_atom_dirty(sctx, &sctx->shader_pointers.atom);
 }
 
 static unsigned u_max_sample(struct pipe_resource *r)
@@ -121,9 +115,7 @@ si_blit_dbcb_copy(struct si_context *sctx,
 
        assert(sctx->dbcb_depth_copy_enabled || sctx->dbcb_stencil_copy_enabled);
 
-       bool old_update_dirtiness = sctx->framebuffer.do_update_surf_dirtiness;
        sctx->decompression_enabled = true;
-       sctx->framebuffer.do_update_surf_dirtiness = false;
 
        while (level_mask) {
                unsigned level = u_bit_scan(&level_mask);
@@ -169,7 +161,6 @@ si_blit_dbcb_copy(struct si_context *sctx,
        }
 
        sctx->decompression_enabled = false;
-       sctx->framebuffer.do_update_surf_dirtiness = old_update_dirtiness;
        sctx->dbcb_depth_copy_enabled = false;
        sctx->dbcb_stencil_copy_enabled = false;
        si_mark_atom_dirty(sctx, &sctx->db_render_state);
@@ -225,9 +216,7 @@ si_blit_decompress_zs_planes_in_place(struct si_context *sctx,
 
        surf_tmpl.format = texture->resource.b.b.format;
 
-       bool old_update_dirtiness = sctx->framebuffer.do_update_surf_dirtiness;
        sctx->decompression_enabled = true;
-       sctx->framebuffer.do_update_surf_dirtiness = false;
 
        while (level_mask) {
                unsigned level = u_bit_scan(&level_mask);
@@ -267,7 +256,6 @@ si_blit_decompress_zs_planes_in_place(struct si_context *sctx,
                texture->stencil_dirty_level_mask &= ~fully_decompressed_mask;
 
        sctx->decompression_enabled = false;
-       sctx->framebuffer.do_update_surf_dirtiness = old_update_dirtiness;
        sctx->db_flush_depth_inplace = false;
        sctx->db_flush_stencil_inplace = false;
        si_mark_atom_dirty(sctx, &sctx->db_render_state);
@@ -327,7 +315,7 @@ si_decompress_depth(struct si_context *sctx,
                levels_z = level_mask & tex->dirty_level_mask;
 
                if (levels_z) {
-                       if (r600_can_sample_zs(tex, false))
+                       if (si_can_sample_zs(tex, false))
                                inplace_planes |= PIPE_MASK_Z;
                        else
                                copy_planes |= PIPE_MASK_Z;
@@ -337,19 +325,25 @@ si_decompress_depth(struct si_context *sctx,
                levels_s = level_mask & tex->stencil_dirty_level_mask;
 
                if (levels_s) {
-                       if (r600_can_sample_zs(tex, true))
+                       if (si_can_sample_zs(tex, true))
                                inplace_planes |= PIPE_MASK_S;
                        else
                                copy_planes |= PIPE_MASK_S;
                }
        }
 
+       if (unlikely(sctx->b.log))
+               u_log_printf(sctx->b.log,
+                            "\n------------------------------------------------\n"
+                            "Decompress Depth (levels %u - %u, levels Z: 0x%x S: 0x%x)\n\n",
+                            first_level, last_level, levels_z, levels_s);
+
        /* We may have to allocate the flushed texture here when called from
         * si_decompress_subresource.
         */
        if (copy_planes &&
            (tex->flushed_depth_texture ||
-            r600_init_flushed_depth_texture(&sctx->b.b, &tex->resource.b.b, NULL))) {
+            si_init_flushed_depth_texture(&sctx->b.b, &tex->resource.b.b, NULL))) {
                struct r600_texture *dst = tex->flushed_depth_texture;
                unsigned fully_copied_levels;
                unsigned levels = 0;
@@ -380,44 +374,47 @@ si_decompress_depth(struct si_context *sctx,
        }
 
        if (inplace_planes) {
-               if (!tex->tc_compatible_htile) {
+               bool has_htile = si_htile_enabled(tex, first_level);
+               bool tc_compat_htile = vi_tc_compat_htile_enabled(tex, first_level);
+
+               /* Don't decompress if there is no HTILE or when HTILE is
+                * TC-compatible. */
+               if (has_htile && !tc_compat_htile) {
                        si_blit_decompress_zs_in_place(
                                                sctx, tex,
                                                levels_z, levels_s,
                                                first_layer, last_layer);
+               } else {
+                       /* This is only a cache flush.
+                        *
+                        * Only clear the mask that we are flushing, because
+                        * si_make_DB_shader_coherent() treats different levels
+                        * and depth and stencil differently.
+                        */
+                       if (inplace_planes & PIPE_MASK_Z)
+                               tex->dirty_level_mask &= ~levels_z;
+                       if (inplace_planes & PIPE_MASK_S)
+                               tex->stencil_dirty_level_mask &= ~levels_s;
                }
 
                /* Only in-place decompression needs to flush DB caches, or
                 * when we don't decompress but TC-compatible planes are dirty.
                 */
-               sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_DB |
-                                SI_CONTEXT_INV_GLOBAL_L2 |
-                                SI_CONTEXT_INV_VMEM_L1;
-
-               /* If we flush DB caches for TC-compatible depth, the dirty
-                * state becomes 0 for the whole mipmap tree and all planes.
-                * (there is nothing else to flush)
-                */
-               if (tex->tc_compatible_htile) {
-                       if (r600_can_sample_zs(tex, false))
-                               tex->dirty_level_mask = 0;
-                       if (r600_can_sample_zs(tex, true))
-                               tex->stencil_dirty_level_mask = 0;
-               }
+               si_make_DB_shader_coherent(sctx, tex->resource.b.b.nr_samples,
+                                          inplace_planes & PIPE_MASK_S,
+                                          tc_compat_htile);
        }
        /* set_framebuffer_state takes care of coherency for single-sample.
         * The DB->CB copy uses CB for the final writes.
         */
-       if (copy_planes && tex->resource.b.b.nr_samples > 1) {
-               sctx->b.flags |= SI_CONTEXT_INV_VMEM_L1 |
-                                SI_CONTEXT_INV_GLOBAL_L2 |
-                                SI_CONTEXT_FLUSH_AND_INV_CB;
-       }
+       if (copy_planes && tex->resource.b.b.nr_samples > 1)
+               si_make_CB_shader_coherent(sctx, tex->resource.b.b.nr_samples,
+                                          false);
 }
 
 static void
 si_decompress_sampler_depth_textures(struct si_context *sctx,
-                                    struct si_textures_info *textures)
+                                    struct si_samplers *textures)
 {
        unsigned i;
        unsigned mask = textures->needs_depth_decompress_mask;
@@ -429,7 +426,7 @@ si_decompress_sampler_depth_textures(struct si_context *sctx,
 
                i = u_bit_scan(&mask);
 
-               view = textures->views.views[i];
+               view = textures->views[i];
                assert(view);
                sview = (struct si_sampler_view*)view;
 
@@ -460,9 +457,17 @@ static void si_blit_decompress_color(struct pipe_context *ctx,
        if (!level_mask)
                return;
 
-       if (rtex->dcc_offset && need_dcc_decompress) {
+       if (unlikely(sctx->b.log))
+               u_log_printf(sctx->b.log,
+                            "\n------------------------------------------------\n"
+                            "Decompress Color (levels %u - %u, mask 0x%x)\n\n",
+                            first_level, last_level, level_mask);
+
+       if (need_dcc_decompress) {
                custom_blend = sctx->custom_blend_dcc_decompress;
 
+               assert(rtex->dcc_offset);
+
                /* disable levels without DCC */
                for (int i = first_level; i <= last_level; i++) {
                        if (!vi_dcc_enabled(rtex, i))
@@ -474,9 +479,7 @@ static void si_blit_decompress_color(struct pipe_context *ctx,
                custom_blend = sctx->custom_blend_eliminate_fastclear;
        }
 
-       bool old_update_dirtiness = sctx->framebuffer.do_update_surf_dirtiness;
        sctx->decompression_enabled = true;
-       sctx->framebuffer.do_update_surf_dirtiness = false;
 
        while (level_mask) {
                unsigned level = u_bit_scan(&level_mask);
@@ -519,11 +522,8 @@ static void si_blit_decompress_color(struct pipe_context *ctx,
        }
 
        sctx->decompression_enabled = false;
-       sctx->framebuffer.do_update_surf_dirtiness = old_update_dirtiness;
-
-       sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB |
-                        SI_CONTEXT_INV_GLOBAL_L2 |
-                        SI_CONTEXT_INV_VMEM_L1;
+       si_make_CB_shader_coherent(sctx, rtex->resource.b.b.nr_samples,
+                                  vi_dcc_enabled(rtex, first_level));
 }
 
 static void
@@ -541,7 +541,7 @@ si_decompress_color_texture(struct si_context *sctx, struct r600_texture *tex,
 
 static void
 si_decompress_sampler_color_textures(struct si_context *sctx,
-                                    struct si_textures_info *textures)
+                                    struct si_samplers *textures)
 {
        unsigned i;
        unsigned mask = textures->needs_color_decompress_mask;
@@ -552,7 +552,7 @@ si_decompress_sampler_color_textures(struct si_context *sctx,
 
                i = u_bit_scan(&mask);
 
-               view = textures->views.views[i];
+               view = textures->views[i];
                assert(view);
 
                tex = (struct r600_texture *)view->texture;
@@ -564,7 +564,7 @@ si_decompress_sampler_color_textures(struct si_context *sctx,
 
 static void
 si_decompress_image_color_textures(struct si_context *sctx,
-                                  struct si_images_info *images)
+                                  struct si_images *images)
 {
        unsigned i;
        unsigned mask = images->needs_color_decompress_mask;
@@ -616,13 +616,13 @@ static void si_check_render_feedback_texture(struct si_context *sctx,
        }
 
        if (render_feedback)
-               r600_texture_disable_dcc(&sctx->b, tex);
+               si_texture_disable_dcc(&sctx->b, tex);
 }
 
 static void si_check_render_feedback_textures(struct si_context *sctx,
-                                              struct si_textures_info *textures)
+                                              struct si_samplers *textures)
 {
-       uint32_t mask = textures->views.enabled_mask;
+       uint32_t mask = textures->enabled_mask;
 
        while (mask) {
                const struct pipe_sampler_view *view;
@@ -630,7 +630,7 @@ static void si_check_render_feedback_textures(struct si_context *sctx,
 
                unsigned i = u_bit_scan(&mask);
 
-               view = textures->views.views[i];
+               view = textures->views[i];
                if(view->texture->target == PIPE_BUFFER)
                        continue;
 
@@ -645,7 +645,7 @@ static void si_check_render_feedback_textures(struct si_context *sctx,
 }
 
 static void si_check_render_feedback_images(struct si_context *sctx,
-                                            struct si_images_info *images)
+                                            struct si_images *images)
 {
        uint32_t mask = images->enabled_mask;
 
@@ -713,6 +713,11 @@ static void si_check_render_feedback_resident_images(struct si_context *sctx)
 
 static void si_check_render_feedback(struct si_context *sctx)
 {
+       /* There is no render feedback if color writes are disabled.
+        * (e.g. a pixel shader with image stores)
+        */
+       if (!si_get_total_colormask(sctx))
+               return;
 
        if (!sctx->need_check_render_feedback)
                return;
@@ -764,7 +769,7 @@ static void si_decompress_resident_images(struct si_context *sctx)
        }
 }
 
-static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
+void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
 {
        unsigned compressed_colortex_counter, mask;
 
@@ -772,7 +777,7 @@ static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask
                return;
 
        /* Update the compressed_colortex_mask if necessary. */
-       compressed_colortex_counter = p_atomic_read(&sctx->screen->b.compressed_colortex_counter);
+       compressed_colortex_counter = p_atomic_read(&sctx->screen->compressed_colortex_counter);
        if (compressed_colortex_counter != sctx->b.last_compressed_colortex_counter) {
                sctx->b.last_compressed_colortex_counter = compressed_colortex_counter;
                si_update_needs_color_decompress_masks(sctx);
@@ -806,151 +811,15 @@ static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask
                        si_decompress_resident_images(sctx);
        }
 
-       si_check_render_feedback(sctx);
-}
-
-void si_decompress_graphics_textures(struct si_context *sctx)
-{
-       si_decompress_textures(sctx, u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS));
-}
-
-void si_decompress_compute_textures(struct si_context *sctx)
-{
-       si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE);
-}
-
-static void si_clear(struct pipe_context *ctx, unsigned buffers,
-                    const union pipe_color_union *color,
-                    double depth, unsigned stencil)
-{
-       struct si_context *sctx = (struct si_context *)ctx;
-       struct pipe_framebuffer_state *fb = &sctx->framebuffer.state;
-       struct pipe_surface *zsbuf = fb->zsbuf;
-       struct r600_texture *zstex =
-               zsbuf ? (struct r600_texture*)zsbuf->texture : NULL;
-
-       if (buffers & PIPE_CLEAR_COLOR) {
-               evergreen_do_fast_color_clear(&sctx->b, fb,
-                                             &sctx->framebuffer.atom, &buffers,
-                                             &sctx->framebuffer.dirty_cbufs,
-                                             color);
-               if (!buffers)
-                       return; /* all buffers have been fast cleared */
-       }
-
-       if (buffers & PIPE_CLEAR_COLOR) {
-               int i;
-
-               /* These buffers cannot use fast clear, make sure to disable expansion. */
-               for (i = 0; i < fb->nr_cbufs; i++) {
-                       struct r600_texture *tex;
-
-                       /* If not clearing this buffer, skip. */
-                       if (!(buffers & (PIPE_CLEAR_COLOR0 << i)))
-                               continue;
-
-                       if (!fb->cbufs[i])
-                               continue;
-
-                       tex = (struct r600_texture *)fb->cbufs[i]->texture;
-                       if (tex->fmask.size == 0)
-                               tex->dirty_level_mask &= ~(1 << fb->cbufs[i]->u.tex.level);
-               }
-       }
-
-       if (zstex && zstex->htile_offset &&
-           zsbuf->u.tex.level == 0 &&
-           zsbuf->u.tex.first_layer == 0 &&
-           zsbuf->u.tex.last_layer == util_max_layer(&zstex->resource.b.b, 0)) {
-               /* TC-compatible HTILE only supports depth clears to 0 or 1. */
-               if (buffers & PIPE_CLEAR_DEPTH &&
-                   (!zstex->tc_compatible_htile ||
-                    depth == 0 || depth == 1)) {
-                       /* Need to disable EXPCLEAR temporarily if clearing
-                        * to a new value. */
-                       if (!zstex->depth_cleared || zstex->depth_clear_value != depth) {
-                               sctx->db_depth_disable_expclear = true;
-                       }
-
-                       zstex->depth_clear_value = depth;
-                       sctx->framebuffer.dirty_zsbuf = true;
-                       si_mark_atom_dirty(sctx, &sctx->framebuffer.atom); /* updates DB_DEPTH_CLEAR */
-                       sctx->db_depth_clear = true;
-                       si_mark_atom_dirty(sctx, &sctx->db_render_state);
-               }
-
-               /* TC-compatible HTILE only supports stencil clears to 0. */
-               if (buffers & PIPE_CLEAR_STENCIL &&
-                   (!zstex->tc_compatible_htile || stencil == 0)) {
-                       stencil &= 0xff;
-
-                       /* Need to disable EXPCLEAR temporarily if clearing
-                        * to a new value. */
-                       if (!zstex->stencil_cleared || zstex->stencil_clear_value != stencil) {
-                               sctx->db_stencil_disable_expclear = true;
-                       }
-
-                       zstex->stencil_clear_value = stencil;
-                       sctx->framebuffer.dirty_zsbuf = true;
-                       si_mark_atom_dirty(sctx, &sctx->framebuffer.atom); /* updates DB_STENCIL_CLEAR */
-                       sctx->db_stencil_clear = true;
-                       si_mark_atom_dirty(sctx, &sctx->db_render_state);
-               }
-       }
-
-       si_blitter_begin(ctx, SI_CLEAR);
-       util_blitter_clear(sctx->blitter, fb->width, fb->height,
-                          util_framebuffer_get_num_layers(fb),
-                          buffers, color, depth, stencil);
-       si_blitter_end(ctx);
-
-       if (sctx->db_depth_clear) {
-               sctx->db_depth_clear = false;
-               sctx->db_depth_disable_expclear = false;
-               zstex->depth_cleared = true;
-               si_mark_atom_dirty(sctx, &sctx->db_render_state);
-       }
-
-       if (sctx->db_stencil_clear) {
-               sctx->db_stencil_clear = false;
-               sctx->db_stencil_disable_expclear = false;
-               zstex->stencil_cleared = true;
-               si_mark_atom_dirty(sctx, &sctx->db_render_state);
+       if (sctx->ps_uses_fbfetch) {
+               struct pipe_surface *cb0 = sctx->framebuffer.state.cbufs[0];
+               si_decompress_color_texture(sctx,
+                                           (struct r600_texture*)cb0->texture,
+                                           cb0->u.tex.first_layer,
+                                           cb0->u.tex.last_layer);
        }
-}
-
-static void si_clear_render_target(struct pipe_context *ctx,
-                                  struct pipe_surface *dst,
-                                  const union pipe_color_union *color,
-                                  unsigned dstx, unsigned dsty,
-                                  unsigned width, unsigned height,
-                                  bool render_condition_enabled)
-{
-       struct si_context *sctx = (struct si_context *)ctx;
 
-       si_blitter_begin(ctx, SI_CLEAR_SURFACE |
-                        (render_condition_enabled ? 0 : SI_DISABLE_RENDER_COND));
-       util_blitter_clear_render_target(sctx->blitter, dst, color,
-                                        dstx, dsty, width, height);
-       si_blitter_end(ctx);
-}
-
-static void si_clear_depth_stencil(struct pipe_context *ctx,
-                                  struct pipe_surface *dst,
-                                  unsigned clear_flags,
-                                  double depth,
-                                  unsigned stencil,
-                                  unsigned dstx, unsigned dsty,
-                                  unsigned width, unsigned height,
-                                  bool render_condition_enabled)
-{
-       struct si_context *sctx = (struct si_context *)ctx;
-
-       si_blitter_begin(ctx, SI_CLEAR_SURFACE |
-                        (render_condition_enabled ? 0 : SI_DISABLE_RENDER_COND));
-       util_blitter_clear_depth_stencil(sctx->blitter, dst, clear_flags, depth, stencil,
-                                        dstx, dsty, width, height);
-       si_blitter_end(ctx);
+       si_check_render_feedback(sctx);
 }
 
 /* Helper for decompressing a portion of a color or depth resource before
@@ -968,13 +837,35 @@ static void si_decompress_subresource(struct pipe_context *ctx,
        if (rtex->db_compatible) {
                planes &= PIPE_MASK_Z | PIPE_MASK_S;
 
-               if (!(rtex->surface.flags & RADEON_SURF_SBUFFER))
+               if (!rtex->surface.has_stencil)
                        planes &= ~PIPE_MASK_S;
 
+               /* If we've rendered into the framebuffer and it's a blitting
+                * source, make sure the decompression pass is invoked
+                * by dirtying the framebuffer.
+                */
+               if (sctx->framebuffer.state.zsbuf &&
+                   sctx->framebuffer.state.zsbuf->u.tex.level == level &&
+                   sctx->framebuffer.state.zsbuf->texture == tex)
+                       si_update_fb_dirtiness_after_rendering(sctx);
+
                si_decompress_depth(sctx, rtex, planes,
                                    level, level,
                                    first_layer, last_layer);
        } else if (rtex->fmask.size || rtex->cmask.size || rtex->dcc_offset) {
+               /* If we've rendered into the framebuffer and it's a blitting
+                * source, make sure the decompression pass is invoked
+                * by dirtying the framebuffer.
+                */
+               for (unsigned i = 0; i < sctx->framebuffer.state.nr_cbufs; i++) {
+                       if (sctx->framebuffer.state.cbufs[i] &&
+                           sctx->framebuffer.state.cbufs[i]->u.tex.level == level &&
+                           sctx->framebuffer.state.cbufs[i]->texture == tex) {
+                               si_update_fb_dirtiness_after_rendering(sctx);
+                               break;
+                       }
+               }
+
                si_blit_decompress_color(ctx, rtex, level, level,
                                         first_layer, last_layer, false);
        }
@@ -1148,7 +1039,7 @@ void si_resource_copy_region(struct pipe_context *ctx,
                                              src_templ.format);
 
        /* Initialize the surface. */
-       dst_view = r600_create_surface_custom(ctx, dst, &dst_templ,
+       dst_view = si_create_surface_custom(ctx, dst, &dst_templ,
                                              dst_width0, dst_height0,
                                              dst_width, dst_height);
 
@@ -1190,9 +1081,7 @@ static void si_do_CB_resolve(struct si_context *sctx,
        si_blitter_end(&sctx->b.b);
 
        /* Flush caches for possible texturing. */
-       sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB |
-                        SI_CONTEXT_INV_GLOBAL_L2 |
-                        SI_CONTEXT_INV_VMEM_L1;
+       si_make_CB_shader_coherent(sctx, 1, false);
 }
 
 static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
@@ -1265,7 +1154,7 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
                            info->dst.resource->last_level != 0)
                                goto resolve_to_temp;
 
-                       vi_dcc_clear_level(&sctx->b, dst, info->dst.level,
+                       vi_dcc_clear_level(sctx, dst, info->dst.level,
                                           0xFFFFFFFF);
                        dst->dirty_level_mask &= ~(1 << info->dst.level);
                }
@@ -1364,7 +1253,7 @@ static void si_blit(struct pipe_context *ctx,
                                  info->src.box.z,
                                  info->src.box.z + info->src.box.depth - 1);
 
-       if (sctx->screen->b.debug_flags & DBG_FORCE_DMA &&
+       if (sctx->screen->debug_flags & DBG(FORCE_DMA) &&
            util_try_blit_via_copy_region(ctx, info))
                return;
 
@@ -1436,8 +1325,7 @@ static void si_flush_resource(struct pipe_context *ctx,
        }
 }
 
-static void si_decompress_dcc(struct pipe_context *ctx,
-                             struct r600_texture *rtex)
+void si_decompress_dcc(struct pipe_context *ctx, struct r600_texture *rtex)
 {
        if (!rtex->dcc_offset)
                return;
@@ -1447,76 +1335,11 @@ static void si_decompress_dcc(struct pipe_context *ctx,
                                 true);
 }
 
-static void si_pipe_clear_buffer(struct pipe_context *ctx,
-                                struct pipe_resource *dst,
-                                unsigned offset, unsigned size,
-                                const void *clear_value_ptr,
-                                int clear_value_size)
-{
-       struct si_context *sctx = (struct si_context*)ctx;
-       uint32_t dword_value;
-       unsigned i;
-
-       assert(offset % clear_value_size == 0);
-       assert(size % clear_value_size == 0);
-
-       if (clear_value_size > 4) {
-               const uint32_t *u32 = clear_value_ptr;
-               bool clear_dword_duplicated = true;
-
-               /* See if we can lower large fills to dword fills. */
-               for (i = 1; i < clear_value_size / 4; i++)
-                       if (u32[0] != u32[i]) {
-                               clear_dword_duplicated = false;
-                               break;
-                       }
-
-               if (!clear_dword_duplicated) {
-                       /* Use transform feedback for 64-bit, 96-bit, and
-                        * 128-bit fills.
-                        */
-                       union pipe_color_union clear_value;
-
-                       memcpy(&clear_value, clear_value_ptr, clear_value_size);
-                       si_blitter_begin(ctx, SI_DISABLE_RENDER_COND);
-                       util_blitter_clear_buffer(sctx->blitter, dst, offset,
-                                                 size, clear_value_size / 4,
-                                                 &clear_value);
-                       si_blitter_end(ctx);
-                       return;
-               }
-       }
-
-       /* Expand the clear value to a dword. */
-       switch (clear_value_size) {
-       case 1:
-               dword_value = *(uint8_t*)clear_value_ptr;
-               dword_value |= (dword_value << 8) |
-                              (dword_value << 16) |
-                              (dword_value << 24);
-               break;
-       case 2:
-               dword_value = *(uint16_t*)clear_value_ptr;
-               dword_value |= dword_value << 16;
-               break;
-       default:
-               dword_value = *(uint32_t*)clear_value_ptr;
-       }
-
-       sctx->b.clear_buffer(ctx, dst, offset, size, dword_value,
-                            R600_COHERENCY_SHADER);
-}
-
 void si_init_blit_functions(struct si_context *sctx)
 {
-       sctx->b.b.clear = si_clear;
-       sctx->b.b.clear_buffer = si_pipe_clear_buffer;
-       sctx->b.b.clear_render_target = si_clear_render_target;
-       sctx->b.b.clear_depth_stencil = si_clear_depth_stencil;
        sctx->b.b.resource_copy_region = si_resource_copy_region;
        sctx->b.b.blit = si_blit;
        sctx->b.b.flush_resource = si_flush_resource;
        sctx->b.b.generate_mipmap = si_generate_mipmap;
        sctx->b.blit_decompress_depth = si_blit_decompress_depth;
-       sctx->b.decompress_dcc = si_decompress_dcc;
 }