radeonsi: extend workaround for KHR-GL45.texture_view.view_classes on gfx9
[mesa.git] / src / gallium / drivers / radeonsi / si_blit.c
index db983eeb221b967cf0432eb248a9a8524d3a8642..4e77e61ac866987d93fd56df3c0731031070807f 100644 (file)
@@ -1,5 +1,7 @@
 /*
  * Copyright 2010 Jerome Glisse <glisse@freedesktop.org>
+ * Copyright 2015 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "si_pipe.h"
 #include "si_compute.h"
-#include "util/u_format.h"
+#include "si_pipe.h"
+#include "util/format/u_format.h"
 #include "util/u_log.h"
 #include "util/u_surface.h"
 
-enum si_blitter_op /* bitmask */
+enum
 {
-       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,
+   SI_COPY =
+      SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES | SI_SAVE_FRAGMENT_STATE | SI_DISABLE_RENDER_COND,
 
-       SI_COPY          = SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES |
-                          SI_SAVE_FRAGMENT_STATE | SI_DISABLE_RENDER_COND,
+   SI_BLIT = SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES | SI_SAVE_FRAGMENT_STATE,
 
-       SI_BLIT          = SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES |
-                          SI_SAVE_FRAGMENT_STATE,
+   SI_DECOMPRESS = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE | SI_DISABLE_RENDER_COND,
 
-       SI_DECOMPRESS    = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE |
-                          SI_DISABLE_RENDER_COND,
-
-       SI_COLOR_RESOLVE = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE
+   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 si_context *sctx, 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_rasterizer(sctx->blitter, sctx->queued.named.rasterizer);
-
-       if (op & SI_SAVE_FRAGMENT_STATE) {
-               util_blitter_save_blend(sctx->blitter, sctx->queued.named.blend);
-               util_blitter_save_depth_stencil_alpha(sctx->blitter, sctx->queued.named.dsa);
-               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]);
-       }
-
-       if (op & SI_SAVE_FRAMEBUFFER)
-               util_blitter_save_framebuffer(sctx->blitter, &sctx->framebuffer.state);
-
-       if (op & SI_SAVE_TEXTURES) {
-               util_blitter_save_fragment_sampler_states(
-                       sctx->blitter, 2,
-                       (void**)sctx->samplers[PIPE_SHADER_FRAGMENT].views.sampler_states);
-
-               util_blitter_save_fragment_sampler_views(sctx->blitter, 2,
-                       sctx->samplers[PIPE_SHADER_FRAGMENT].views.views);
-       }
-
-       if (op & SI_DISABLE_RENDER_COND)
-               sctx->b.render_cond_force_off = true;
+   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->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) {
+      util_blitter_save_blend(sctx->blitter, sctx->queued.named.blend);
+      util_blitter_save_depth_stencil_alpha(sctx->blitter, sctx->queued.named.dsa);
+      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);
+      util_blitter_save_scissor(sctx->blitter, &sctx->scissors[0]);
+      util_blitter_save_window_rectangles(sctx->blitter, sctx->window_rectangles_include,
+                                          sctx->num_window_rectangles, sctx->window_rectangles);
+   }
+
+   if (op & SI_SAVE_FRAMEBUFFER)
+      util_blitter_save_framebuffer(sctx->blitter, &sctx->framebuffer.state);
+
+   if (op & SI_SAVE_TEXTURES) {
+      util_blitter_save_fragment_sampler_states(
+         sctx->blitter, 2, (void **)sctx->samplers[PIPE_SHADER_FRAGMENT].sampler_states);
+
+      util_blitter_save_fragment_sampler_views(sctx->blitter, 2,
+                                               sctx->samplers[PIPE_SHADER_FRAGMENT].views);
+   }
+
+   if (op & SI_DISABLE_RENDER_COND)
+      sctx->render_cond_force_off = true;
+
+   if (sctx->screen->dpbb_allowed) {
+      sctx->dpbb_force_off = true;
+      si_mark_atom_dirty(sctx, &sctx->atoms.s.dpbb_state);
+   }
 }
 
-static void si_blitter_end(struct pipe_context *ctx)
+void si_blitter_end(struct si_context *sctx)
 {
-       struct si_context *sctx = (struct si_context *)ctx;
-
-       sctx->b.render_cond_force_off = false;
+   if (sctx->screen->dpbb_allowed) {
+      sctx->dpbb_force_off = false;
+      si_mark_atom_dirty(sctx, &sctx->atoms.s.dpbb_state);
+   }
+
+   sctx->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;
+   sctx->vertex_buffer_user_sgprs_dirty = sctx->num_vertex_elements > 0;
+   si_mark_atom_dirty(sctx, &sctx->atoms.s.shader_pointers);
 }
 
 static unsigned u_max_sample(struct pipe_resource *r)
 {
-       return r->nr_samples ? r->nr_samples - 1 : 0;
+   return r->nr_samples ? r->nr_samples - 1 : 0;
 }
 
-static unsigned
-si_blit_dbcb_copy(struct si_context *sctx,
-                 struct r600_texture *src,
-                 struct r600_texture *dst,
-                 unsigned planes, unsigned level_mask,
-                 unsigned first_layer, unsigned last_layer,
-                 unsigned first_sample, unsigned last_sample)
+static unsigned si_blit_dbcb_copy(struct si_context *sctx, struct si_texture *src,
+                                  struct si_texture *dst, unsigned planes, unsigned level_mask,
+                                  unsigned first_layer, unsigned last_layer, unsigned first_sample,
+                                  unsigned last_sample)
 {
-       struct pipe_surface surf_tmpl = {{0}};
-       unsigned layer, sample, checked_last_layer, max_layer;
-       unsigned fully_copied_levels = 0;
-
-       if (planes & PIPE_MASK_Z)
-               sctx->dbcb_depth_copy_enabled = true;
-       if (planes & PIPE_MASK_S)
-               sctx->dbcb_stencil_copy_enabled = true;
-       si_mark_atom_dirty(sctx, &sctx->db_render_state);
+   struct pipe_surface surf_tmpl = {{0}};
+   unsigned layer, sample, checked_last_layer, max_layer;
+   unsigned fully_copied_levels = 0;
 
-       assert(sctx->dbcb_depth_copy_enabled || sctx->dbcb_stencil_copy_enabled);
+   if (planes & PIPE_MASK_Z)
+      sctx->dbcb_depth_copy_enabled = true;
+   if (planes & PIPE_MASK_S)
+      sctx->dbcb_stencil_copy_enabled = true;
+   si_mark_atom_dirty(sctx, &sctx->atoms.s.db_render_state);
 
-       sctx->decompression_enabled = true;
+   assert(sctx->dbcb_depth_copy_enabled || sctx->dbcb_stencil_copy_enabled);
 
-       while (level_mask) {
-               unsigned level = u_bit_scan(&level_mask);
+   sctx->decompression_enabled = true;
 
-               /* The smaller the mipmap level, the less layers there are
-                * as far as 3D textures are concerned. */
-               max_layer = util_max_layer(&src->resource.b.b, level);
-               checked_last_layer = MIN2(last_layer, max_layer);
+   while (level_mask) {
+      unsigned level = u_bit_scan(&level_mask);
 
-               surf_tmpl.u.tex.level = level;
+      /* The smaller the mipmap level, the less layers there are
+       * as far as 3D textures are concerned. */
+      max_layer = util_max_layer(&src->buffer.b.b, level);
+      checked_last_layer = MIN2(last_layer, max_layer);
 
-               for (layer = first_layer; layer <= checked_last_layer; layer++) {
-                       struct pipe_surface *zsurf, *cbsurf;
+      surf_tmpl.u.tex.level = level;
 
-                       surf_tmpl.format = src->resource.b.b.format;
-                       surf_tmpl.u.tex.first_layer = layer;
-                       surf_tmpl.u.tex.last_layer = layer;
+      for (layer = first_layer; layer <= checked_last_layer; layer++) {
+         struct pipe_surface *zsurf, *cbsurf;
 
-                       zsurf = sctx->b.b.create_surface(&sctx->b.b, &src->resource.b.b, &surf_tmpl);
+         surf_tmpl.format = src->buffer.b.b.format;
+         surf_tmpl.u.tex.first_layer = layer;
+         surf_tmpl.u.tex.last_layer = layer;
 
-                       surf_tmpl.format = dst->resource.b.b.format;
-                       cbsurf = sctx->b.b.create_surface(&sctx->b.b, &dst->resource.b.b, &surf_tmpl);
+         zsurf = sctx->b.create_surface(&sctx->b, &src->buffer.b.b, &surf_tmpl);
 
-                       for (sample = first_sample; sample <= last_sample; sample++) {
-                               if (sample != sctx->dbcb_copy_sample) {
-                                       sctx->dbcb_copy_sample = sample;
-                                       si_mark_atom_dirty(sctx, &sctx->db_render_state);
-                               }
+         surf_tmpl.format = dst->buffer.b.b.format;
+         cbsurf = sctx->b.create_surface(&sctx->b, &dst->buffer.b.b, &surf_tmpl);
 
-                               si_blitter_begin(&sctx->b.b, SI_DECOMPRESS);
-                               util_blitter_custom_depth_stencil(sctx->blitter, zsurf, cbsurf, 1 << sample,
-                                                                 sctx->custom_dsa_flush, 1.0f);
-                               si_blitter_end(&sctx->b.b);
-                       }
+         for (sample = first_sample; sample <= last_sample; sample++) {
+            if (sample != sctx->dbcb_copy_sample) {
+               sctx->dbcb_copy_sample = sample;
+               si_mark_atom_dirty(sctx, &sctx->atoms.s.db_render_state);
+            }
 
-                       pipe_surface_reference(&zsurf, NULL);
-                       pipe_surface_reference(&cbsurf, NULL);
-               }
-
-               if (first_layer == 0 && last_layer >= max_layer &&
-                   first_sample == 0 && last_sample >= u_max_sample(&src->resource.b.b))
-                       fully_copied_levels |= 1u << level;
-       }
-
-       sctx->decompression_enabled = false;
-       sctx->dbcb_depth_copy_enabled = false;
-       sctx->dbcb_stencil_copy_enabled = false;
-       si_mark_atom_dirty(sctx, &sctx->db_render_state);
-
-       return fully_copied_levels;
-}
-
-static void si_blit_decompress_depth(struct pipe_context *ctx,
-                                    struct r600_texture *texture,
-                                    struct r600_texture *staging,
-                                    unsigned first_level, unsigned last_level,
-                                    unsigned first_layer, unsigned last_layer,
-                                    unsigned first_sample, unsigned last_sample)
-{
-       const struct util_format_description *desc;
-       unsigned planes = 0;
+            si_blitter_begin(sctx, SI_DECOMPRESS);
+            util_blitter_custom_depth_stencil(sctx->blitter, zsurf, cbsurf, 1 << sample,
+                                              sctx->custom_dsa_flush, 1.0f);
+            si_blitter_end(sctx);
+         }
 
-       assert(staging != NULL && "use si_blit_decompress_zs_in_place instead");
+         pipe_surface_reference(&zsurf, NULL);
+         pipe_surface_reference(&cbsurf, NULL);
+      }
 
-       desc = util_format_description(staging->resource.b.b.format);
+      if (first_layer == 0 && last_layer >= max_layer && first_sample == 0 &&
+          last_sample >= u_max_sample(&src->buffer.b.b))
+         fully_copied_levels |= 1u << level;
+   }
 
-       if (util_format_has_depth(desc))
-               planes |= PIPE_MASK_Z;
-       if (util_format_has_stencil(desc))
-               planes |= PIPE_MASK_S;
+   sctx->decompression_enabled = false;
+   sctx->dbcb_depth_copy_enabled = false;
+   sctx->dbcb_stencil_copy_enabled = false;
+   si_mark_atom_dirty(sctx, &sctx->atoms.s.db_render_state);
 
-       si_blit_dbcb_copy(
-               (struct si_context *)ctx, texture, staging, planes,
-               u_bit_consecutive(first_level, last_level - first_level + 1),
-               first_layer, last_layer, first_sample, last_sample);
+   return fully_copied_levels;
 }
 
 /* Helper function for si_blit_decompress_zs_in_place.
  */
-static void
-si_blit_decompress_zs_planes_in_place(struct si_context *sctx,
-                                     struct r600_texture *texture,
-                                     unsigned planes, unsigned level_mask,
-                                     unsigned first_layer, unsigned last_layer)
+static void si_blit_decompress_zs_planes_in_place(struct si_context *sctx,
+                                                  struct si_texture *texture, unsigned planes,
+                                                  unsigned level_mask, unsigned first_layer,
+                                                  unsigned last_layer)
 {
-       struct pipe_surface *zsurf, surf_tmpl = {{0}};
-       unsigned layer, max_layer, checked_last_layer;
-       unsigned fully_decompressed_mask = 0;
+   struct pipe_surface *zsurf, surf_tmpl = {{0}};
+   unsigned layer, max_layer, checked_last_layer;
+   unsigned fully_decompressed_mask = 0;
 
-       if (!level_mask)
-               return;
+   if (!level_mask)
+      return;
 
-       if (planes & PIPE_MASK_S)
-               sctx->db_flush_stencil_inplace = true;
-       if (planes & PIPE_MASK_Z)
-               sctx->db_flush_depth_inplace = true;
-       si_mark_atom_dirty(sctx, &sctx->db_render_state);
+   if (planes & PIPE_MASK_S)
+      sctx->db_flush_stencil_inplace = true;
+   if (planes & PIPE_MASK_Z)
+      sctx->db_flush_depth_inplace = true;
+   si_mark_atom_dirty(sctx, &sctx->atoms.s.db_render_state);
 
-       surf_tmpl.format = texture->resource.b.b.format;
+   surf_tmpl.format = texture->buffer.b.b.format;
 
-       sctx->decompression_enabled = true;
+   sctx->decompression_enabled = true;
 
-       while (level_mask) {
-               unsigned level = u_bit_scan(&level_mask);
+   while (level_mask) {
+      unsigned level = u_bit_scan(&level_mask);
 
-               surf_tmpl.u.tex.level = level;
+      surf_tmpl.u.tex.level = level;
 
-               /* The smaller the mipmap level, the less layers there are
-                * as far as 3D textures are concerned. */
-               max_layer = util_max_layer(&texture->resource.b.b, level);
-               checked_last_layer = MIN2(last_layer, max_layer);
+      /* The smaller the mipmap level, the less layers there are
+       * as far as 3D textures are concerned. */
+      max_layer = util_max_layer(&texture->buffer.b.b, level);
+      checked_last_layer = MIN2(last_layer, max_layer);
 
-               for (layer = first_layer; layer <= checked_last_layer; layer++) {
-                       surf_tmpl.u.tex.first_layer = layer;
-                       surf_tmpl.u.tex.last_layer = layer;
+      for (layer = first_layer; layer <= checked_last_layer; layer++) {
+         surf_tmpl.u.tex.first_layer = layer;
+         surf_tmpl.u.tex.last_layer = layer;
 
-                       zsurf = sctx->b.b.create_surface(&sctx->b.b, &texture->resource.b.b, &surf_tmpl);
+         zsurf = sctx->b.create_surface(&sctx->b, &texture->buffer.b.b, &surf_tmpl);
 
-                       si_blitter_begin(&sctx->b.b, SI_DECOMPRESS);
-                       util_blitter_custom_depth_stencil(sctx->blitter, zsurf, NULL, ~0,
-                                                         sctx->custom_dsa_flush,
-                                                         1.0f);
-                       si_blitter_end(&sctx->b.b);
+         si_blitter_begin(sctx, SI_DECOMPRESS);
+         util_blitter_custom_depth_stencil(sctx->blitter, zsurf, NULL, ~0, sctx->custom_dsa_flush,
+                                           1.0f);
+         si_blitter_end(sctx);
 
-                       pipe_surface_reference(&zsurf, NULL);
-               }
+         pipe_surface_reference(&zsurf, NULL);
+      }
 
-               /* The texture will always be dirty if some layers aren't flushed.
-                * I don't think this case occurs often though. */
-               if (first_layer == 0 && last_layer >= max_layer) {
-                       fully_decompressed_mask |= 1u << level;
-               }
-       }
+      /* The texture will always be dirty if some layers aren't flushed.
+       * I don't think this case occurs often though. */
+      if (first_layer == 0 && last_layer >= max_layer) {
+         fully_decompressed_mask |= 1u << level;
+      }
+   }
 
-       if (planes & PIPE_MASK_Z)
-               texture->dirty_level_mask &= ~fully_decompressed_mask;
-       if (planes & PIPE_MASK_S)
-               texture->stencil_dirty_level_mask &= ~fully_decompressed_mask;
+   if (planes & PIPE_MASK_Z)
+      texture->dirty_level_mask &= ~fully_decompressed_mask;
+   if (planes & PIPE_MASK_S)
+      texture->stencil_dirty_level_mask &= ~fully_decompressed_mask;
 
-       sctx->decompression_enabled = false;
-       sctx->db_flush_depth_inplace = false;
-       sctx->db_flush_stencil_inplace = false;
-       si_mark_atom_dirty(sctx, &sctx->db_render_state);
+   sctx->decompression_enabled = false;
+   sctx->db_flush_depth_inplace = false;
+   sctx->db_flush_stencil_inplace = false;
+   si_mark_atom_dirty(sctx, &sctx->atoms.s.db_render_state);
 }
 
 /* Helper function of si_flush_depth_texture: decompress the given levels
  * of Z and/or S planes in place.
  */
-static void
-si_blit_decompress_zs_in_place(struct si_context *sctx,
-                              struct r600_texture *texture,
-                              unsigned levels_z, unsigned levels_s,
-                              unsigned first_layer, unsigned last_layer)
+static void si_blit_decompress_zs_in_place(struct si_context *sctx, struct si_texture *texture,
+                                           unsigned levels_z, unsigned levels_s,
+                                           unsigned first_layer, unsigned last_layer)
 {
-       unsigned both = levels_z & levels_s;
-
-       /* First, do combined Z & S decompresses for levels that need it. */
-       if (both) {
-               si_blit_decompress_zs_planes_in_place(
-                               sctx, texture, PIPE_MASK_Z | PIPE_MASK_S,
-                               both,
-                               first_layer, last_layer);
-               levels_z &= ~both;
-               levels_s &= ~both;
-       }
-
-       /* Now do separate Z and S decompresses. */
-       if (levels_z) {
-               si_blit_decompress_zs_planes_in_place(
-                               sctx, texture, PIPE_MASK_Z,
-                               levels_z,
-                               first_layer, last_layer);
-       }
-
-       if (levels_s) {
-               si_blit_decompress_zs_planes_in_place(
-                               sctx, texture, PIPE_MASK_S,
-                               levels_s,
-                               first_layer, last_layer);
-       }
+   unsigned both = levels_z & levels_s;
+
+   /* First, do combined Z & S decompresses for levels that need it. */
+   if (both) {
+      si_blit_decompress_zs_planes_in_place(sctx, texture, PIPE_MASK_Z | PIPE_MASK_S, both,
+                                            first_layer, last_layer);
+      levels_z &= ~both;
+      levels_s &= ~both;
+   }
+
+   /* Now do separate Z and S decompresses. */
+   if (levels_z) {
+      si_blit_decompress_zs_planes_in_place(sctx, texture, PIPE_MASK_Z, levels_z, first_layer,
+                                            last_layer);
+   }
+
+   if (levels_s) {
+      si_blit_decompress_zs_planes_in_place(sctx, texture, PIPE_MASK_S, levels_s, first_layer,
+                                            last_layer);
+   }
 }
 
-static void
-si_decompress_depth(struct si_context *sctx,
-                   struct r600_texture *tex,
-                   unsigned required_planes,
-                   unsigned first_level, unsigned last_level,
-                   unsigned first_layer, unsigned last_layer)
+static void si_decompress_depth(struct si_context *sctx, struct si_texture *tex,
+                                unsigned required_planes, unsigned first_level, unsigned last_level,
+                                unsigned first_layer, unsigned last_layer)
 {
-       unsigned inplace_planes = 0;
-       unsigned copy_planes = 0;
-       unsigned level_mask = u_bit_consecutive(first_level, last_level - first_level + 1);
-       unsigned levels_z = 0;
-       unsigned levels_s = 0;
-
-       if (required_planes & PIPE_MASK_Z) {
-               levels_z = level_mask & tex->dirty_level_mask;
-
-               if (levels_z) {
-                       if (r600_can_sample_zs(tex, false))
-                               inplace_planes |= PIPE_MASK_Z;
-                       else
-                               copy_planes |= PIPE_MASK_Z;
-               }
-       }
-       if (required_planes & PIPE_MASK_S) {
-               levels_s = level_mask & tex->stencil_dirty_level_mask;
-
-               if (levels_s) {
-                       if (r600_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))) {
-               struct r600_texture *dst = tex->flushed_depth_texture;
-               unsigned fully_copied_levels;
-               unsigned levels = 0;
-
-               assert(tex->flushed_depth_texture);
-
-               if (util_format_is_depth_and_stencil(dst->resource.b.b.format))
-                       copy_planes = PIPE_MASK_Z | PIPE_MASK_S;
-
-               if (copy_planes & PIPE_MASK_Z) {
-                       levels |= levels_z;
-                       levels_z = 0;
-               }
-               if (copy_planes & PIPE_MASK_S) {
-                       levels |= levels_s;
-                       levels_s = 0;
-               }
-
-               fully_copied_levels = si_blit_dbcb_copy(
-                       sctx, tex, dst, copy_planes, levels,
-                       first_layer, last_layer,
-                       0, u_max_sample(&tex->resource.b.b));
-
-               if (copy_planes & PIPE_MASK_Z)
-                       tex->dirty_level_mask &= ~fully_copied_levels;
-               if (copy_planes & PIPE_MASK_S)
-                       tex->stencil_dirty_level_mask &= ~fully_copied_levels;
-       }
-
-       if (inplace_planes) {
-               if (!tex->tc_compatible_htile) {
-                       si_blit_decompress_zs_in_place(
-                                               sctx, tex,
-                                               levels_z, levels_s,
-                                               first_layer, last_layer);
-               }
-
-               /* 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;
-               }
-       }
-       /* 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;
-       }
+   unsigned inplace_planes = 0;
+   unsigned copy_planes = 0;
+   unsigned level_mask = u_bit_consecutive(first_level, last_level - first_level + 1);
+   unsigned levels_z = 0;
+   unsigned levels_s = 0;
+
+   if (required_planes & PIPE_MASK_Z) {
+      levels_z = level_mask & tex->dirty_level_mask;
+
+      if (levels_z) {
+         if (si_can_sample_zs(tex, false))
+            inplace_planes |= PIPE_MASK_Z;
+         else
+            copy_planes |= PIPE_MASK_Z;
+      }
+   }
+   if (required_planes & PIPE_MASK_S) {
+      levels_s = level_mask & tex->stencil_dirty_level_mask;
+
+      if (levels_s) {
+         if (si_can_sample_zs(tex, true))
+            inplace_planes |= PIPE_MASK_S;
+         else
+            copy_planes |= PIPE_MASK_S;
+      }
+   }
+
+   if (unlikely(sctx->log))
+      u_log_printf(sctx->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 || si_init_flushed_depth_texture(&sctx->b, &tex->buffer.b.b))) {
+      struct si_texture *dst = tex->flushed_depth_texture;
+      unsigned fully_copied_levels;
+      unsigned levels = 0;
+
+      assert(tex->flushed_depth_texture);
+
+      if (util_format_is_depth_and_stencil(dst->buffer.b.b.format))
+         copy_planes = PIPE_MASK_Z | PIPE_MASK_S;
+
+      if (copy_planes & PIPE_MASK_Z) {
+         levels |= levels_z;
+         levels_z = 0;
+      }
+      if (copy_planes & PIPE_MASK_S) {
+         levels |= levels_s;
+         levels_s = 0;
+      }
+
+      fully_copied_levels = si_blit_dbcb_copy(sctx, tex, dst, copy_planes, levels, first_layer,
+                                              last_layer, 0, u_max_sample(&tex->buffer.b.b));
+
+      if (copy_planes & PIPE_MASK_Z)
+         tex->dirty_level_mask &= ~fully_copied_levels;
+      if (copy_planes & PIPE_MASK_S)
+         tex->stencil_dirty_level_mask &= ~fully_copied_levels;
+   }
+
+   if (inplace_planes) {
+      bool has_htile = si_htile_enabled(tex, first_level, inplace_planes);
+      bool tc_compat_htile = vi_tc_compat_htile_enabled(tex, first_level, inplace_planes);
+
+      /* 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;
+      }
+
+      /* We just had to completely decompress Z/S for texturing. Enable
+       * TC-compatible HTILE on the next clear, so that the decompression
+       * doesn't have to be done for this texture ever again.
+       *
+       * TC-compatible HTILE might slightly reduce Z/S performance, but
+       * the decompression is much worse.
+       */
+      if (has_htile && !tc_compat_htile &&
+          tex->surface.flags & RADEON_SURF_TC_COMPATIBLE_HTILE &&
+          (inplace_planes & PIPE_MASK_Z || !tex->htile_stencil_disabled))
+         tex->enable_tc_compatible_htile_next_clear = true;
+
+      /* Only in-place decompression needs to flush DB caches, or
+       * when we don't decompress but TC-compatible planes are dirty.
+       */
+      si_make_DB_shader_coherent(sctx, tex->buffer.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->buffer.b.b.nr_samples > 1)
+      si_make_CB_shader_coherent(sctx, tex->buffer.b.b.nr_samples, false, true /* no DCC */);
 }
 
-static void
-si_decompress_sampler_depth_textures(struct si_context *sctx,
-                                    struct si_textures_info *textures)
+static void si_decompress_sampler_depth_textures(struct si_context *sctx,
+                                                 struct si_samplers *textures)
 {
-       unsigned i;
-       unsigned mask = textures->needs_depth_decompress_mask;
+   unsigned i;
+   unsigned mask = textures->needs_depth_decompress_mask;
 
-       while (mask) {
-               struct pipe_sampler_view *view;
-               struct si_sampler_view *sview;
-               struct r600_texture *tex;
+   while (mask) {
+      struct pipe_sampler_view *view;
+      struct si_sampler_view *sview;
+      struct si_texture *tex;
 
-               i = u_bit_scan(&mask);
+      i = u_bit_scan(&mask);
 
-               view = textures->views.views[i];
-               assert(view);
-               sview = (struct si_sampler_view*)view;
+      view = textures->views[i];
+      assert(view);
+      sview = (struct si_sampler_view *)view;
 
-               tex = (struct r600_texture *)view->texture;
-               assert(tex->db_compatible);
+      tex = (struct si_texture *)view->texture;
+      assert(tex->db_compatible);
 
-               si_decompress_depth(sctx, tex,
-                                   sview->is_stencil_sampler ? PIPE_MASK_S : PIPE_MASK_Z,
-                                   view->u.tex.first_level, view->u.tex.last_level,
-                                   0, util_max_layer(&tex->resource.b.b, view->u.tex.first_level));
-       }
+      si_decompress_depth(sctx, tex, sview->is_stencil_sampler ? PIPE_MASK_S : PIPE_MASK_Z,
+                          view->u.tex.first_level, view->u.tex.last_level, 0,
+                          util_max_layer(&tex->buffer.b.b, view->u.tex.first_level));
+   }
 }
 
-static void si_blit_decompress_color(struct pipe_context *ctx,
-               struct r600_texture *rtex,
-               unsigned first_level, unsigned last_level,
-               unsigned first_layer, unsigned last_layer,
-               bool need_dcc_decompress)
+static void si_blit_decompress_color(struct si_context *sctx, struct si_texture *tex,
+                                     unsigned first_level, unsigned last_level,
+                                     unsigned first_layer, unsigned last_layer,
+                                     bool need_dcc_decompress, bool need_fmask_expand)
 {
-       struct si_context *sctx = (struct si_context *)ctx;
-       void* custom_blend;
-       unsigned layer, checked_last_layer, max_layer;
-       unsigned level_mask =
-               u_bit_consecutive(first_level, last_level - first_level + 1);
-
-       if (!need_dcc_decompress)
-               level_mask &= rtex->dirty_level_mask;
-       if (!level_mask)
-               return;
-
-       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 (rtex->dcc_offset && need_dcc_decompress) {
-               custom_blend = sctx->custom_blend_dcc_decompress;
-
-               /* disable levels without DCC */
-               for (int i = first_level; i <= last_level; i++) {
-                       if (!vi_dcc_enabled(rtex, i))
-                               level_mask &= ~(1 << i);
-               }
-       } else if (rtex->fmask.size) {
-               custom_blend = sctx->custom_blend_fmask_decompress;
-       } else {
-               custom_blend = sctx->custom_blend_eliminate_fastclear;
-       }
-
-       sctx->decompression_enabled = true;
-
-       while (level_mask) {
-               unsigned level = u_bit_scan(&level_mask);
-
-               /* The smaller the mipmap level, the less layers there are
-                * as far as 3D textures are concerned. */
-               max_layer = util_max_layer(&rtex->resource.b.b, level);
-               checked_last_layer = MIN2(last_layer, max_layer);
-
-               for (layer = first_layer; layer <= checked_last_layer; layer++) {
-                       struct pipe_surface *cbsurf, surf_tmpl;
-
-                       surf_tmpl.format = rtex->resource.b.b.format;
-                       surf_tmpl.u.tex.level = level;
-                       surf_tmpl.u.tex.first_layer = layer;
-                       surf_tmpl.u.tex.last_layer = layer;
-                       cbsurf = ctx->create_surface(ctx, &rtex->resource.b.b, &surf_tmpl);
-
-                       /* Required before and after FMASK and DCC_DECOMPRESS. */
-                       if (custom_blend == sctx->custom_blend_fmask_decompress ||
-                           custom_blend == sctx->custom_blend_dcc_decompress)
-                               sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB;
-
-                       si_blitter_begin(ctx, SI_DECOMPRESS);
-                       util_blitter_custom_color(sctx->blitter, cbsurf, custom_blend);
-                       si_blitter_end(ctx);
-
-                       if (custom_blend == sctx->custom_blend_fmask_decompress ||
-                           custom_blend == sctx->custom_blend_dcc_decompress)
-                               sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB;
-
-                       pipe_surface_reference(&cbsurf, NULL);
-               }
-
-               /* The texture will always be dirty if some layers aren't flushed.
-                * I don't think this case occurs often though. */
-               if (first_layer == 0 && last_layer >= max_layer) {
-                       rtex->dirty_level_mask &= ~(1 << level);
-               }
-       }
-
-       sctx->decompression_enabled = false;
-
-       sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB |
-                        SI_CONTEXT_INV_GLOBAL_L2 |
-                        SI_CONTEXT_INV_VMEM_L1;
+   void *custom_blend;
+   unsigned layer, checked_last_layer, max_layer;
+   unsigned level_mask = u_bit_consecutive(first_level, last_level - first_level + 1);
+
+   if (!need_dcc_decompress)
+      level_mask &= tex->dirty_level_mask;
+   if (!level_mask)
+      goto expand_fmask;
+
+   if (unlikely(sctx->log))
+      u_log_printf(sctx->log,
+                   "\n------------------------------------------------\n"
+                   "Decompress Color (levels %u - %u, mask 0x%x)\n\n",
+                   first_level, last_level, level_mask);
+
+   if (need_dcc_decompress) {
+      assert(sctx->chip_class == GFX8);
+      custom_blend = sctx->custom_blend_dcc_decompress;
+
+      assert(vi_dcc_enabled(tex, first_level));
+
+      /* disable levels without DCC */
+      for (int i = first_level; i <= last_level; i++) {
+         if (!vi_dcc_enabled(tex, i))
+            level_mask &= ~(1 << i);
+      }
+   } else if (tex->surface.fmask_size) {
+      custom_blend = sctx->custom_blend_fmask_decompress;
+   } else {
+      custom_blend = sctx->custom_blend_eliminate_fastclear;
+   }
+
+   sctx->decompression_enabled = true;
+
+   while (level_mask) {
+      unsigned level = u_bit_scan(&level_mask);
+
+      /* The smaller the mipmap level, the less layers there are
+       * as far as 3D textures are concerned. */
+      max_layer = util_max_layer(&tex->buffer.b.b, level);
+      checked_last_layer = MIN2(last_layer, max_layer);
+
+      for (layer = first_layer; layer <= checked_last_layer; layer++) {
+         struct pipe_surface *cbsurf, surf_tmpl;
+
+         surf_tmpl.format = tex->buffer.b.b.format;
+         surf_tmpl.u.tex.level = level;
+         surf_tmpl.u.tex.first_layer = layer;
+         surf_tmpl.u.tex.last_layer = layer;
+         cbsurf = sctx->b.create_surface(&sctx->b, &tex->buffer.b.b, &surf_tmpl);
+
+         /* Required before and after FMASK and DCC_DECOMPRESS. */
+         if (custom_blend == sctx->custom_blend_fmask_decompress ||
+             custom_blend == sctx->custom_blend_dcc_decompress)
+            sctx->flags |= SI_CONTEXT_FLUSH_AND_INV_CB;
+
+         si_blitter_begin(sctx, SI_DECOMPRESS);
+         util_blitter_custom_color(sctx->blitter, cbsurf, custom_blend);
+         si_blitter_end(sctx);
+
+         if (custom_blend == sctx->custom_blend_fmask_decompress ||
+             custom_blend == sctx->custom_blend_dcc_decompress)
+            sctx->flags |= SI_CONTEXT_FLUSH_AND_INV_CB;
+
+         pipe_surface_reference(&cbsurf, NULL);
+      }
+
+      /* The texture will always be dirty if some layers aren't flushed.
+       * I don't think this case occurs often though. */
+      if (first_layer == 0 && last_layer >= max_layer) {
+         tex->dirty_level_mask &= ~(1 << level);
+      }
+   }
+
+   sctx->decompression_enabled = false;
+   si_make_CB_shader_coherent(sctx, tex->buffer.b.b.nr_samples, vi_dcc_enabled(tex, first_level),
+                              tex->surface.u.gfx9.dcc.pipe_aligned);
+
+expand_fmask:
+   if (need_fmask_expand && tex->surface.fmask_offset && !tex->fmask_is_identity) {
+      si_compute_expand_fmask(&sctx->b, &tex->buffer.b.b);
+      tex->fmask_is_identity = true;
+   }
 }
 
-static void
-si_decompress_color_texture(struct si_context *sctx, struct r600_texture *tex,
-                           unsigned first_level, unsigned last_level)
+static void si_decompress_color_texture(struct si_context *sctx, struct si_texture *tex,
+                                        unsigned first_level, unsigned last_level,
+                                        bool need_fmask_expand)
 {
-       /* CMASK or DCC can be discarded and we can still end up here. */
-       if (!tex->cmask.size && !tex->fmask.size && !tex->dcc_offset)
-               return;
-
-       si_blit_decompress_color(&sctx->b.b, tex, first_level, last_level, 0,
-                                util_max_layer(&tex->resource.b.b, first_level),
-                                false);
+   /* CMASK or DCC can be discarded and we can still end up here. */
+   if (!tex->cmask_buffer && !tex->surface.fmask_size &&
+       !vi_dcc_enabled(tex, first_level))
+      return;
+
+   si_blit_decompress_color(sctx, tex, first_level, last_level, 0,
+                            util_max_layer(&tex->buffer.b.b, first_level), false,
+                            need_fmask_expand);
 }
 
-static void
-si_decompress_sampler_color_textures(struct si_context *sctx,
-                                    struct si_textures_info *textures)
+static void si_decompress_sampler_color_textures(struct si_context *sctx,
+                                                 struct si_samplers *textures)
 {
-       unsigned i;
-       unsigned mask = textures->needs_color_decompress_mask;
+   unsigned i;
+   unsigned mask = textures->needs_color_decompress_mask;
 
-       while (mask) {
-               struct pipe_sampler_view *view;
-               struct r600_texture *tex;
+   while (mask) {
+      struct pipe_sampler_view *view;
+      struct si_texture *tex;
 
-               i = u_bit_scan(&mask);
+      i = u_bit_scan(&mask);
 
-               view = textures->views.views[i];
-               assert(view);
+      view = textures->views[i];
+      assert(view);
 
-               tex = (struct r600_texture *)view->texture;
+      tex = (struct si_texture *)view->texture;
 
-               si_decompress_color_texture(sctx, tex, view->u.tex.first_level,
-                                           view->u.tex.last_level);
-       }
+      si_decompress_color_texture(sctx, tex, view->u.tex.first_level, view->u.tex.last_level,
+                                  false);
+   }
 }
 
-static void
-si_decompress_image_color_textures(struct si_context *sctx,
-                                  struct si_images_info *images)
+static void si_decompress_image_color_textures(struct si_context *sctx, struct si_images *images)
 {
-       unsigned i;
-       unsigned mask = images->needs_color_decompress_mask;
+   unsigned i;
+   unsigned mask = images->needs_color_decompress_mask;
 
-       while (mask) {
-               const struct pipe_image_view *view;
-               struct r600_texture *tex;
+   while (mask) {
+      const struct pipe_image_view *view;
+      struct si_texture *tex;
 
-               i = u_bit_scan(&mask);
+      i = u_bit_scan(&mask);
 
-               view = &images->views[i];
-               assert(view->resource->target != PIPE_BUFFER);
+      view = &images->views[i];
+      assert(view->resource->target != PIPE_BUFFER);
 
-               tex = (struct r600_texture *)view->resource;
+      tex = (struct si_texture *)view->resource;
 
-               si_decompress_color_texture(sctx, tex, view->u.tex.level,
-                                           view->u.tex.level);
-       }
+      si_decompress_color_texture(sctx, tex, view->u.tex.level, view->u.tex.level,
+                                  view->access & PIPE_IMAGE_ACCESS_WRITE);
+   }
 }
 
-static void si_check_render_feedback_texture(struct si_context *sctx,
-                                            struct r600_texture *tex,
-                                            unsigned first_level,
-                                            unsigned last_level,
-                                            unsigned first_layer,
-                                            unsigned last_layer)
+static void si_check_render_feedback_texture(struct si_context *sctx, struct si_texture *tex,
+                                             unsigned first_level, unsigned last_level,
+                                             unsigned first_layer, unsigned last_layer)
 {
-       bool render_feedback = false;
+   bool render_feedback = false;
 
-       if (!tex->dcc_offset)
-               return;
+   if (!vi_dcc_enabled(tex, first_level))
+      return;
 
-       for (unsigned j = 0; j < sctx->framebuffer.state.nr_cbufs; ++j) {
-               struct r600_surface * surf;
+   for (unsigned j = 0; j < sctx->framebuffer.state.nr_cbufs; ++j) {
+      struct si_surface *surf;
 
-               if (!sctx->framebuffer.state.cbufs[j])
-                       continue;
+      if (!sctx->framebuffer.state.cbufs[j])
+         continue;
 
-               surf = (struct r600_surface*)sctx->framebuffer.state.cbufs[j];
+      surf = (struct si_surface *)sctx->framebuffer.state.cbufs[j];
 
-               if (tex == (struct r600_texture *)surf->base.texture &&
-                   surf->base.u.tex.level >= first_level &&
-                   surf->base.u.tex.level <= last_level &&
-                   surf->base.u.tex.first_layer <= last_layer &&
-                   surf->base.u.tex.last_layer >= first_layer) {
-                       render_feedback = true;
-                       break;
-               }
-       }
+      if (tex == (struct si_texture *)surf->base.texture && surf->base.u.tex.level >= first_level &&
+          surf->base.u.tex.level <= last_level && surf->base.u.tex.first_layer <= last_layer &&
+          surf->base.u.tex.last_layer >= first_layer) {
+         render_feedback = true;
+         break;
+      }
+   }
 
-       if (render_feedback)
-               r600_texture_disable_dcc(&sctx->b, tex);
+   if (render_feedback)
+      si_texture_disable_dcc(sctx, tex);
 }
 
-static void si_check_render_feedback_textures(struct si_context *sctx,
-                                              struct si_textures_info *textures)
+static void si_check_render_feedback_textures(struct si_context *sctx, 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;
-               struct r600_texture *tex;
+   while (mask) {
+      const struct pipe_sampler_view *view;
+      struct si_texture *tex;
 
-               unsigned i = u_bit_scan(&mask);
+      unsigned i = u_bit_scan(&mask);
 
-               view = textures->views.views[i];
-               if(view->texture->target == PIPE_BUFFER)
-                       continue;
+      view = textures->views[i];
+      if (view->texture->target == PIPE_BUFFER)
+         continue;
 
-               tex = (struct r600_texture *)view->texture;
+      tex = (struct si_texture *)view->texture;
 
-               si_check_render_feedback_texture(sctx, tex,
-                                                view->u.tex.first_level,
-                                                view->u.tex.last_level,
-                                                view->u.tex.first_layer,
-                                                view->u.tex.last_layer);
-       }
+      si_check_render_feedback_texture(sctx, tex, view->u.tex.first_level, view->u.tex.last_level,
+                                       view->u.tex.first_layer, view->u.tex.last_layer);
+   }
 }
 
-static void si_check_render_feedback_images(struct si_context *sctx,
-                                            struct si_images_info *images)
+static void si_check_render_feedback_images(struct si_context *sctx, struct si_images *images)
 {
-       uint32_t mask = images->enabled_mask;
+   uint32_t mask = images->enabled_mask;
 
-       while (mask) {
-               const struct pipe_image_view *view;
-               struct r600_texture *tex;
+   while (mask) {
+      const struct pipe_image_view *view;
+      struct si_texture *tex;
 
-               unsigned i = u_bit_scan(&mask);
+      unsigned i = u_bit_scan(&mask);
 
-               view = &images->views[i];
-               if (view->resource->target == PIPE_BUFFER)
-                       continue;
+      view = &images->views[i];
+      if (view->resource->target == PIPE_BUFFER)
+         continue;
 
-               tex = (struct r600_texture *)view->resource;
+      tex = (struct si_texture *)view->resource;
 
-               si_check_render_feedback_texture(sctx, tex,
-                                                view->u.tex.level,
-                                                view->u.tex.level,
-                                                view->u.tex.first_layer,
-                                                view->u.tex.last_layer);
-       }
+      si_check_render_feedback_texture(sctx, tex, view->u.tex.level, view->u.tex.level,
+                                       view->u.tex.first_layer, view->u.tex.last_layer);
+   }
 }
 
 static void si_check_render_feedback_resident_textures(struct si_context *sctx)
 {
-       util_dynarray_foreach(&sctx->resident_tex_handles,
-                             struct si_texture_handle *, tex_handle) {
-               struct pipe_sampler_view *view;
-               struct r600_texture *tex;
-
-               view = (*tex_handle)->view;
-               if (view->texture->target == PIPE_BUFFER)
-                       continue;
-
-               tex = (struct r600_texture *)view->texture;
-
-               si_check_render_feedback_texture(sctx, tex,
-                                                view->u.tex.first_level,
-                                                view->u.tex.last_level,
-                                                view->u.tex.first_layer,
-                                                view->u.tex.last_layer);
-       }
-}
+   util_dynarray_foreach (&sctx->resident_tex_handles, struct si_texture_handle *, tex_handle) {
+      struct pipe_sampler_view *view;
+      struct si_texture *tex;
 
-static void si_check_render_feedback_resident_images(struct si_context *sctx)
-{
-       util_dynarray_foreach(&sctx->resident_img_handles,
-                             struct si_image_handle *, img_handle) {
-               struct pipe_image_view *view;
-               struct r600_texture *tex;
-
-               view = &(*img_handle)->view;
-               if (view->resource->target == PIPE_BUFFER)
-                       continue;
-
-               tex = (struct r600_texture *)view->resource;
-
-               si_check_render_feedback_texture(sctx, tex,
-                                                view->u.tex.level,
-                                                view->u.tex.level,
-                                                view->u.tex.first_layer,
-                                                view->u.tex.last_layer);
-       }
+      view = (*tex_handle)->view;
+      if (view->texture->target == PIPE_BUFFER)
+         continue;
+
+      tex = (struct si_texture *)view->texture;
+
+      si_check_render_feedback_texture(sctx, tex, view->u.tex.first_level, view->u.tex.last_level,
+                                       view->u.tex.first_layer, view->u.tex.last_layer);
+   }
 }
 
-static void si_check_render_feedback(struct si_context *sctx)
+static void si_check_render_feedback_resident_images(struct si_context *sctx)
 {
+   util_dynarray_foreach (&sctx->resident_img_handles, struct si_image_handle *, img_handle) {
+      struct pipe_image_view *view;
+      struct si_texture *tex;
 
-       if (!sctx->need_check_render_feedback)
-               return;
-
-       for (int i = 0; i < SI_NUM_SHADERS; ++i) {
-               si_check_render_feedback_images(sctx, &sctx->images[i]);
-               si_check_render_feedback_textures(sctx, &sctx->samplers[i]);
-       }
+      view = &(*img_handle)->view;
+      if (view->resource->target == PIPE_BUFFER)
+         continue;
 
-       si_check_render_feedback_resident_images(sctx);
-       si_check_render_feedback_resident_textures(sctx);
+      tex = (struct si_texture *)view->resource;
 
-       sctx->need_check_render_feedback = false;
+      si_check_render_feedback_texture(sctx, tex, view->u.tex.level, view->u.tex.level,
+                                       view->u.tex.first_layer, view->u.tex.last_layer);
+   }
 }
 
-static void si_decompress_resident_textures(struct si_context *sctx)
+static void si_check_render_feedback(struct si_context *sctx)
 {
-       util_dynarray_foreach(&sctx->resident_tex_needs_color_decompress,
-                             struct si_texture_handle *, tex_handle) {
-               struct pipe_sampler_view *view = (*tex_handle)->view;
-               struct r600_texture *tex = (struct r600_texture *)view->texture;
-
-               si_decompress_color_texture(sctx, tex, view->u.tex.first_level,
-                                           view->u.tex.last_level);
-       }
-
-       util_dynarray_foreach(&sctx->resident_tex_needs_depth_decompress,
-                             struct si_texture_handle *, tex_handle) {
-               struct pipe_sampler_view *view = (*tex_handle)->view;
-               struct si_sampler_view *sview = (struct si_sampler_view *)view;
-               struct r600_texture *tex = (struct r600_texture *)view->texture;
-
-               si_decompress_depth(sctx, tex,
-                       sview->is_stencil_sampler ? PIPE_MASK_S : PIPE_MASK_Z,
-                       view->u.tex.first_level, view->u.tex.last_level,
-                       0, util_max_layer(&tex->resource.b.b, view->u.tex.first_level));
-       }
-}
+   if (!sctx->need_check_render_feedback)
+      return;
 
-static void si_decompress_resident_images(struct si_context *sctx)
-{
-       util_dynarray_foreach(&sctx->resident_img_needs_color_decompress,
-                             struct si_image_handle *, img_handle) {
-               struct pipe_image_view *view = &(*img_handle)->view;
-               struct r600_texture *tex = (struct r600_texture *)view->resource;
-
-               si_decompress_color_texture(sctx, tex, view->u.tex.level,
-                                           view->u.tex.level);
-       }
-}
+   /* 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;
 
-static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
-{
-       unsigned compressed_colortex_counter, mask;
-
-       if (sctx->blitter->running)
-               return;
-
-       /* Update the compressed_colortex_mask if necessary. */
-       compressed_colortex_counter = p_atomic_read(&sctx->screen->b.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);
-       }
-
-       /* Decompress color & depth textures if needed. */
-       mask = sctx->shader_needs_decompress_mask & shader_mask;
-       while (mask) {
-               unsigned i = u_bit_scan(&mask);
-
-               if (sctx->samplers[i].needs_depth_decompress_mask) {
-                       si_decompress_sampler_depth_textures(sctx, &sctx->samplers[i]);
-               }
-               if (sctx->samplers[i].needs_color_decompress_mask) {
-                       si_decompress_sampler_color_textures(sctx, &sctx->samplers[i]);
-               }
-               if (sctx->images[i].needs_color_decompress_mask) {
-                       si_decompress_image_color_textures(sctx, &sctx->images[i]);
-               }
-       }
-
-       if (shader_mask & u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS)) {
-               if (sctx->uses_bindless_samplers)
-                       si_decompress_resident_textures(sctx);
-               if (sctx->uses_bindless_images)
-                       si_decompress_resident_images(sctx);
-       } else if (shader_mask & (1 << PIPE_SHADER_COMPUTE)) {
-               if (sctx->cs_shader_state.program->uses_bindless_samplers)
-                       si_decompress_resident_textures(sctx);
-               if (sctx->cs_shader_state.program->uses_bindless_images)
-                       si_decompress_resident_images(sctx);
-       }
-
-       si_check_render_feedback(sctx);
-}
+   for (int i = 0; i < SI_NUM_SHADERS; ++i) {
+      si_check_render_feedback_images(sctx, &sctx->images[i]);
+      si_check_render_feedback_textures(sctx, &sctx->samplers[i]);
+   }
 
-void si_decompress_graphics_textures(struct si_context *sctx)
-{
-       si_decompress_textures(sctx, u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS));
-}
+   si_check_render_feedback_resident_images(sctx);
+   si_check_render_feedback_resident_textures(sctx);
 
-void si_decompress_compute_textures(struct si_context *sctx)
-{
-       si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE);
+   sctx->need_check_render_feedback = false;
 }
 
-static void si_clear(struct pipe_context *ctx, unsigned buffers,
-                    const union pipe_color_union *color,
-                    double depth, unsigned stencil)
+static void si_decompress_resident_textures(struct si_context *sctx)
 {
-       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);
-       }
+   util_dynarray_foreach (&sctx->resident_tex_needs_color_decompress, struct si_texture_handle *,
+                          tex_handle) {
+      struct pipe_sampler_view *view = (*tex_handle)->view;
+      struct si_texture *tex = (struct si_texture *)view->texture;
+
+      si_decompress_color_texture(sctx, tex, view->u.tex.first_level, view->u.tex.last_level,
+                                  false);
+   }
+
+   util_dynarray_foreach (&sctx->resident_tex_needs_depth_decompress, struct si_texture_handle *,
+                          tex_handle) {
+      struct pipe_sampler_view *view = (*tex_handle)->view;
+      struct si_sampler_view *sview = (struct si_sampler_view *)view;
+      struct si_texture *tex = (struct si_texture *)view->texture;
+
+      si_decompress_depth(sctx, tex, sview->is_stencil_sampler ? PIPE_MASK_S : PIPE_MASK_Z,
+                          view->u.tex.first_level, view->u.tex.last_level, 0,
+                          util_max_layer(&tex->buffer.b.b, view->u.tex.first_level));
+   }
 }
 
-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)
+static void si_decompress_resident_images(struct si_context *sctx)
 {
-       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);
+   util_dynarray_foreach (&sctx->resident_img_needs_color_decompress, struct si_image_handle *,
+                          img_handle) {
+      struct pipe_image_view *view = &(*img_handle)->view;
+      struct si_texture *tex = (struct si_texture *)view->resource;
+
+      si_decompress_color_texture(sctx, tex, view->u.tex.level, view->u.tex.level,
+                                  view->access & PIPE_IMAGE_ACCESS_WRITE);
+   }
 }
 
-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)
+void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
 {
-       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);
+   unsigned compressed_colortex_counter, mask;
+
+   if (sctx->blitter->running)
+      return;
+
+   /* Update the compressed_colortex_mask if necessary. */
+   compressed_colortex_counter = p_atomic_read(&sctx->screen->compressed_colortex_counter);
+   if (compressed_colortex_counter != sctx->last_compressed_colortex_counter) {
+      sctx->last_compressed_colortex_counter = compressed_colortex_counter;
+      si_update_needs_color_decompress_masks(sctx);
+   }
+
+   /* Decompress color & depth textures if needed. */
+   mask = sctx->shader_needs_decompress_mask & shader_mask;
+   while (mask) {
+      unsigned i = u_bit_scan(&mask);
+
+      if (sctx->samplers[i].needs_depth_decompress_mask) {
+         si_decompress_sampler_depth_textures(sctx, &sctx->samplers[i]);
+      }
+      if (sctx->samplers[i].needs_color_decompress_mask) {
+         si_decompress_sampler_color_textures(sctx, &sctx->samplers[i]);
+      }
+      if (sctx->images[i].needs_color_decompress_mask) {
+         si_decompress_image_color_textures(sctx, &sctx->images[i]);
+      }
+   }
+
+   if (shader_mask & u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS)) {
+      if (sctx->uses_bindless_samplers)
+         si_decompress_resident_textures(sctx);
+      if (sctx->uses_bindless_images)
+         si_decompress_resident_images(sctx);
+
+      if (sctx->ps_uses_fbfetch) {
+         struct pipe_surface *cb0 = sctx->framebuffer.state.cbufs[0];
+         si_decompress_color_texture(sctx, (struct si_texture *)cb0->texture,
+                                     cb0->u.tex.first_layer, cb0->u.tex.last_layer, false);
+      }
+
+      si_check_render_feedback(sctx);
+   } else if (shader_mask & (1 << PIPE_SHADER_COMPUTE)) {
+      if (sctx->cs_shader_state.program->sel.info.uses_bindless_samplers)
+         si_decompress_resident_textures(sctx);
+      if (sctx->cs_shader_state.program->sel.info.uses_bindless_images)
+         si_decompress_resident_images(sctx);
+   }
 }
 
 /* Helper for decompressing a portion of a color or depth resource before
  * blitting if any decompression is needed.
  * The driver doesn't decompress resources automatically while u_blitter is
  * rendering. */
-static void si_decompress_subresource(struct pipe_context *ctx,
-                                     struct pipe_resource *tex,
-                                     unsigned planes, unsigned level,
-                                     unsigned first_layer, unsigned last_layer)
+void si_decompress_subresource(struct pipe_context *ctx, struct pipe_resource *tex, unsigned planes,
+                               unsigned level, unsigned first_layer, unsigned last_layer)
 {
-       struct si_context *sctx = (struct si_context *)ctx;
-       struct r600_texture *rtex = (struct r600_texture*)tex;
-
-       if (rtex->db_compatible) {
-               planes &= PIPE_MASK_Z | PIPE_MASK_S;
-
-               if (!(rtex->surface.flags & RADEON_SURF_SBUFFER))
-                       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);
-       }
+   struct si_context *sctx = (struct si_context *)ctx;
+   struct si_texture *stex = (struct si_texture *)tex;
+
+   if (stex->db_compatible) {
+      planes &= PIPE_MASK_Z | PIPE_MASK_S;
+
+      if (!stex->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, stex, planes, level, level, first_layer, last_layer);
+   } else if (stex->surface.fmask_size || stex->cmask_buffer ||
+              vi_dcc_enabled(stex, level)) {
+      /* 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(sctx, stex, level, level, first_layer, last_layer, false, false);
+   }
 }
 
 struct texture_orig_info {
-       unsigned format;
-       unsigned width0;
-       unsigned height0;
-       unsigned npix_x;
-       unsigned npix_y;
-       unsigned npix0_x;
-       unsigned npix0_y;
+   unsigned format;
+   unsigned width0;
+   unsigned height0;
+   unsigned npix_x;
+   unsigned npix_y;
+   unsigned npix0_x;
+   unsigned npix0_y;
 };
 
-void si_resource_copy_region(struct pipe_context *ctx,
-                            struct pipe_resource *dst,
-                            unsigned dst_level,
-                            unsigned dstx, unsigned dsty, unsigned dstz,
-                            struct pipe_resource *src,
-                            unsigned src_level,
-                            const struct pipe_box *src_box)
-{
-       struct si_context *sctx = (struct si_context *)ctx;
-       struct r600_texture *rsrc = (struct r600_texture*)src;
-       struct pipe_surface *dst_view, dst_templ;
-       struct pipe_sampler_view src_templ, *src_view;
-       unsigned dst_width, dst_height, src_width0, src_height0;
-       unsigned dst_width0, dst_height0, src_force_level = 0;
-       struct pipe_box sbox, dstbox;
-
-       /* Handle buffers first. */
-       if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
-               si_copy_buffer(sctx, dst, src, dstx, src_box->x, src_box->width, 0);
-               return;
-       }
-
-       assert(u_max_sample(dst) == u_max_sample(src));
-
-       /* The driver doesn't decompress resources automatically while
-        * u_blitter is rendering. */
-       si_decompress_subresource(ctx, src, PIPE_MASK_RGBAZS, src_level,
-                                 src_box->z, src_box->z + src_box->depth - 1);
-
-       dst_width = u_minify(dst->width0, dst_level);
-       dst_height = u_minify(dst->height0, dst_level);
-       dst_width0 = dst->width0;
-       dst_height0 = dst->height0;
-       src_width0 = src->width0;
-       src_height0 = src->height0;
-
-       util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
-       util_blitter_default_src_texture(sctx->blitter, &src_templ, src, src_level);
-
-       if (util_format_is_compressed(src->format) ||
-           util_format_is_compressed(dst->format)) {
-               unsigned blocksize = rsrc->surface.bpe;
-
-               if (blocksize == 8)
-                       src_templ.format = PIPE_FORMAT_R16G16B16A16_UINT; /* 64-bit block */
-               else
-                       src_templ.format = PIPE_FORMAT_R32G32B32A32_UINT; /* 128-bit block */
-               dst_templ.format = src_templ.format;
-
-               dst_width = util_format_get_nblocksx(dst->format, dst_width);
-               dst_height = util_format_get_nblocksy(dst->format, dst_height);
-               dst_width0 = util_format_get_nblocksx(dst->format, dst_width0);
-               dst_height0 = util_format_get_nblocksy(dst->format, dst_height0);
-               src_width0 = util_format_get_nblocksx(src->format, src_width0);
-               src_height0 = util_format_get_nblocksy(src->format, src_height0);
-
-               dstx = util_format_get_nblocksx(dst->format, dstx);
-               dsty = util_format_get_nblocksy(dst->format, dsty);
-
-               sbox.x = util_format_get_nblocksx(src->format, src_box->x);
-               sbox.y = util_format_get_nblocksy(src->format, src_box->y);
-               sbox.z = src_box->z;
-               sbox.width = util_format_get_nblocksx(src->format, src_box->width);
-               sbox.height = util_format_get_nblocksy(src->format, src_box->height);
-               sbox.depth = src_box->depth;
-               src_box = &sbox;
-
-               src_force_level = src_level;
-       } else if (!util_blitter_is_copy_supported(sctx->blitter, dst, src)) {
-               if (util_format_is_subsampled_422(src->format)) {
-                       src_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;
-                       dst_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;
-
-                       dst_width = util_format_get_nblocksx(dst->format, dst_width);
-                       dst_width0 = util_format_get_nblocksx(dst->format, dst_width0);
-                       src_width0 = util_format_get_nblocksx(src->format, src_width0);
-
-                       dstx = util_format_get_nblocksx(dst->format, dstx);
-
-                       sbox = *src_box;
-                       sbox.x = util_format_get_nblocksx(src->format, src_box->x);
-                       sbox.width = util_format_get_nblocksx(src->format, src_box->width);
-                       src_box = &sbox;
-               } else {
-                       unsigned blocksize = rsrc->surface.bpe;
-
-                       switch (blocksize) {
-                       case 1:
-                               dst_templ.format = PIPE_FORMAT_R8_UNORM;
-                               src_templ.format = PIPE_FORMAT_R8_UNORM;
-                               break;
-                       case 2:
-                               dst_templ.format = PIPE_FORMAT_R8G8_UNORM;
-                               src_templ.format = PIPE_FORMAT_R8G8_UNORM;
-                               break;
-                       case 4:
-                               dst_templ.format = PIPE_FORMAT_R8G8B8A8_UNORM;
-                               src_templ.format = PIPE_FORMAT_R8G8B8A8_UNORM;
-                               break;
-                       case 8:
-                               dst_templ.format = PIPE_FORMAT_R16G16B16A16_UINT;
-                               src_templ.format = PIPE_FORMAT_R16G16B16A16_UINT;
-                               break;
-                       case 16:
-                               dst_templ.format = PIPE_FORMAT_R32G32B32A32_UINT;
-                               src_templ.format = PIPE_FORMAT_R32G32B32A32_UINT;
-                               break;
-                       default:
-                               fprintf(stderr, "Unhandled format %s with blocksize %u\n",
-                                       util_format_short_name(src->format), blocksize);
-                               assert(0);
-                       }
-               }
-       }
-
-       /* SNORM8 blitting has precision issues on some chips. Use the SINT
-        * equivalent instead, which doesn't force DCC decompression.
-        * Note that some chips avoid this issue by using SDMA.
-        */
-       if (util_format_is_snorm8(dst_templ.format)) {
-               switch (dst_templ.format) {
-               case PIPE_FORMAT_R8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_R8_SINT;
-                       break;
-               case PIPE_FORMAT_R8G8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_R8G8_SINT;
-                       break;
-               case PIPE_FORMAT_R8G8B8X8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_R8G8B8X8_SINT;
-                       break;
-               case PIPE_FORMAT_R8G8B8A8_SNORM:
-               /* There are no SINT variants for ABGR and XBGR, so we have to use RGBA. */
-               case PIPE_FORMAT_A8B8G8R8_SNORM:
-               case PIPE_FORMAT_X8B8G8R8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_R8G8B8A8_SINT;
-                       break;
-               case PIPE_FORMAT_A8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_A8_SINT;
-                       break;
-               case PIPE_FORMAT_L8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_L8_SINT;
-                       break;
-               case PIPE_FORMAT_L8A8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_L8A8_SINT;
-                       break;
-               case PIPE_FORMAT_I8_SNORM:
-                       dst_templ.format = src_templ.format = PIPE_FORMAT_I8_SINT;
-                       break;
-               default:; /* fall through */
-               }
-       }
-
-       vi_disable_dcc_if_incompatible_format(&sctx->b, dst, dst_level,
-                                             dst_templ.format);
-       vi_disable_dcc_if_incompatible_format(&sctx->b, src, src_level,
-                                             src_templ.format);
-
-       /* Initialize the surface. */
-       dst_view = r600_create_surface_custom(ctx, dst, &dst_templ,
-                                             dst_width0, dst_height0,
-                                             dst_width, dst_height);
-
-       /* Initialize the sampler view. */
-       src_view = si_create_sampler_view_custom(ctx, src, &src_templ,
-                                                src_width0, src_height0,
-                                                src_force_level);
-
-       u_box_3d(dstx, dsty, dstz, abs(src_box->width), abs(src_box->height),
-                abs(src_box->depth), &dstbox);
-
-       /* Copy. */
-       si_blitter_begin(ctx, SI_COPY);
-       util_blitter_blit_generic(sctx->blitter, dst_view, &dstbox,
-                                 src_view, src_box, src_width0, src_height0,
-                                 PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL,
-                                 false);
-       si_blitter_end(ctx);
-
-       pipe_surface_reference(&dst_view, NULL);
-       pipe_sampler_view_reference(&src_view, NULL);
+static void si_use_compute_copy_for_float_formats(struct si_context *sctx,
+                                                  struct pipe_resource *texture,
+                                                  unsigned level) {
+   struct si_texture *tex = (struct si_texture *)texture;
+
+   /* If we are uploading into FP16 or R11G11B10_FLOAT via a blit, CB clobbers NaNs,
+    * so in order to preserve them exactly, we have to use the compute blit.
+    * The compute blit is used only when the destination doesn't have DCC, so
+    * disable it here, which is kinda a hack.
+    * If we are uploading into 32-bit floats with DCC via a blit, NaNs will also get
+    * lost so we need to disable DCC as well.
+    *
+    * This makes KHR-GL45.texture_view.view_classes pass on gfx9.
+    * gfx10 has the same issue, but the test doesn't use a large enough texture
+    * to enable DCC and fail, so it always passes.
+    */
+   if (vi_dcc_enabled(tex, level) &&
+       util_format_is_float(texture->format)) {
+      si_texture_disable_dcc(sctx, tex);
+   }
 }
 
-static void si_do_CB_resolve(struct si_context *sctx,
-                            const struct pipe_blit_info *info,
-                            struct pipe_resource *dst,
-                            unsigned dst_level, unsigned dst_z,
-                            enum pipe_format format)
+void si_resource_copy_region(struct pipe_context *ctx, struct pipe_resource *dst,
+                             unsigned dst_level, unsigned dstx, unsigned dsty, unsigned dstz,
+                             struct pipe_resource *src, unsigned src_level,
+                             const struct pipe_box *src_box)
 {
-       /* Required before and after CB_RESOLVE. */
-       sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB;
-
-       si_blitter_begin(&sctx->b.b, SI_COLOR_RESOLVE |
-                        (info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND));
-       util_blitter_custom_resolve_color(sctx->blitter, dst, dst_level, dst_z,
-                                         info->src.resource, info->src.box.z,
-                                         ~0, sctx->custom_blend_resolve,
-                                         format);
-       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;
+   struct si_context *sctx = (struct si_context *)ctx;
+   struct si_texture *ssrc = (struct si_texture *)src;
+   struct si_texture *sdst = (struct si_texture *)dst;
+   struct pipe_surface *dst_view, dst_templ;
+   struct pipe_sampler_view src_templ, *src_view;
+   unsigned dst_width, dst_height, src_width0, src_height0;
+   unsigned dst_width0, dst_height0, src_force_level = 0;
+   struct pipe_box sbox, dstbox;
+
+   /* Handle buffers first. */
+   if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
+      si_copy_buffer(sctx, dst, src, dstx, src_box->x, src_box->width);
+      return;
+   }
+
+   si_use_compute_copy_for_float_formats(sctx, dst, dst_level);
+
+   if (!util_format_is_compressed(src->format) && !util_format_is_compressed(dst->format) &&
+       !util_format_is_depth_or_stencil(src->format) && src->nr_samples <= 1 &&
+       !vi_dcc_enabled(sdst, dst_level) &&
+       !(dst->target != src->target &&
+         (src->target == PIPE_TEXTURE_1D_ARRAY || dst->target == PIPE_TEXTURE_1D_ARRAY))) {
+      si_compute_copy_image(sctx, dst, dst_level, src, src_level, dstx, dsty, dstz,
+                            src_box, false);
+      return;
+   }
+
+   assert(u_max_sample(dst) == u_max_sample(src));
+
+   /* The driver doesn't decompress resources automatically while
+    * u_blitter is rendering. */
+   si_decompress_subresource(ctx, src, PIPE_MASK_RGBAZS, src_level, src_box->z,
+                             src_box->z + src_box->depth - 1);
+
+   dst_width = u_minify(dst->width0, dst_level);
+   dst_height = u_minify(dst->height0, dst_level);
+   dst_width0 = dst->width0;
+   dst_height0 = dst->height0;
+   src_width0 = src->width0;
+   src_height0 = src->height0;
+
+   util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
+   util_blitter_default_src_texture(sctx->blitter, &src_templ, src, src_level);
+
+   if (util_format_is_compressed(src->format) || util_format_is_compressed(dst->format)) {
+      unsigned blocksize = ssrc->surface.bpe;
+
+      if (blocksize == 8)
+         src_templ.format = PIPE_FORMAT_R16G16B16A16_UINT; /* 64-bit block */
+      else
+         src_templ.format = PIPE_FORMAT_R32G32B32A32_UINT; /* 128-bit block */
+      dst_templ.format = src_templ.format;
+
+      dst_width = util_format_get_nblocksx(dst->format, dst_width);
+      dst_height = util_format_get_nblocksy(dst->format, dst_height);
+      dst_width0 = util_format_get_nblocksx(dst->format, dst_width0);
+      dst_height0 = util_format_get_nblocksy(dst->format, dst_height0);
+      src_width0 = util_format_get_nblocksx(src->format, src_width0);
+      src_height0 = util_format_get_nblocksy(src->format, src_height0);
+
+      dstx = util_format_get_nblocksx(dst->format, dstx);
+      dsty = util_format_get_nblocksy(dst->format, dsty);
+
+      sbox.x = util_format_get_nblocksx(src->format, src_box->x);
+      sbox.y = util_format_get_nblocksy(src->format, src_box->y);
+      sbox.z = src_box->z;
+      sbox.width = util_format_get_nblocksx(src->format, src_box->width);
+      sbox.height = util_format_get_nblocksy(src->format, src_box->height);
+      sbox.depth = src_box->depth;
+      src_box = &sbox;
+
+      src_force_level = src_level;
+   } else if (!util_blitter_is_copy_supported(sctx->blitter, dst, src)) {
+      if (util_format_is_subsampled_422(src->format)) {
+         src_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;
+         dst_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;
+
+         dst_width = util_format_get_nblocksx(dst->format, dst_width);
+         dst_width0 = util_format_get_nblocksx(dst->format, dst_width0);
+         src_width0 = util_format_get_nblocksx(src->format, src_width0);
+
+         dstx = util_format_get_nblocksx(dst->format, dstx);
+
+         sbox = *src_box;
+         sbox.x = util_format_get_nblocksx(src->format, src_box->x);
+         sbox.width = util_format_get_nblocksx(src->format, src_box->width);
+         src_box = &sbox;
+      } else {
+         unsigned blocksize = ssrc->surface.bpe;
+
+         switch (blocksize) {
+         case 1:
+            dst_templ.format = PIPE_FORMAT_R8_UNORM;
+            src_templ.format = PIPE_FORMAT_R8_UNORM;
+            break;
+         case 2:
+            dst_templ.format = PIPE_FORMAT_R8G8_UNORM;
+            src_templ.format = PIPE_FORMAT_R8G8_UNORM;
+            break;
+         case 4:
+            dst_templ.format = PIPE_FORMAT_R8G8B8A8_UNORM;
+            src_templ.format = PIPE_FORMAT_R8G8B8A8_UNORM;
+            break;
+         case 8:
+            dst_templ.format = PIPE_FORMAT_R16G16B16A16_UINT;
+            src_templ.format = PIPE_FORMAT_R16G16B16A16_UINT;
+            break;
+         case 16:
+            dst_templ.format = PIPE_FORMAT_R32G32B32A32_UINT;
+            src_templ.format = PIPE_FORMAT_R32G32B32A32_UINT;
+            break;
+         default:
+            fprintf(stderr, "Unhandled format %s with blocksize %u\n",
+                    util_format_short_name(src->format), blocksize);
+            assert(0);
+         }
+      }
+   }
+
+   /* SNORM8 blitting has precision issues on some chips. Use the SINT
+    * equivalent instead, which doesn't force DCC decompression.
+    * Note that some chips avoid this issue by using SDMA.
+    */
+   if (util_format_is_snorm8(dst_templ.format)) {
+      dst_templ.format = src_templ.format = util_format_snorm8_to_sint8(dst_templ.format);
+   }
+
+   vi_disable_dcc_if_incompatible_format(sctx, dst, dst_level, dst_templ.format);
+   vi_disable_dcc_if_incompatible_format(sctx, src, src_level, src_templ.format);
+
+   /* Initialize the surface. */
+   dst_view = si_create_surface_custom(ctx, dst, &dst_templ, dst_width0, dst_height0, dst_width,
+                                       dst_height);
+
+   /* Initialize the sampler view. */
+   src_view =
+      si_create_sampler_view_custom(ctx, src, &src_templ, src_width0, src_height0, src_force_level);
+
+   u_box_3d(dstx, dsty, dstz, abs(src_box->width), abs(src_box->height), abs(src_box->depth),
+            &dstbox);
+
+   /* Copy. */
+   si_blitter_begin(sctx, SI_COPY);
+   util_blitter_blit_generic(sctx->blitter, dst_view, &dstbox, src_view, src_box, src_width0,
+                             src_height0, PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL, false);
+   si_blitter_end(sctx);
+
+   pipe_surface_reference(&dst_view, NULL);
+   pipe_sampler_view_reference(&src_view, NULL);
 }
 
-static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
-                                    const struct pipe_blit_info *info)
+static void si_do_CB_resolve(struct si_context *sctx, const struct pipe_blit_info *info,
+                             struct pipe_resource *dst, unsigned dst_level, unsigned dst_z,
+                             enum pipe_format format)
 {
-       struct si_context *sctx = (struct si_context*)ctx;
-       struct r600_texture *src = (struct r600_texture*)info->src.resource;
-       struct r600_texture *dst = (struct r600_texture*)info->dst.resource;
-       MAYBE_UNUSED struct r600_texture *rtmp;
-       unsigned dst_width = u_minify(info->dst.resource->width0, info->dst.level);
-       unsigned dst_height = u_minify(info->dst.resource->height0, info->dst.level);
-       enum pipe_format format = info->src.format;
-       struct pipe_resource *tmp, templ;
-       struct pipe_blit_info blit;
-
-       /* Check basic requirements for hw resolve. */
-       if (!(info->src.resource->nr_samples > 1 &&
-             info->dst.resource->nr_samples <= 1 &&
-             !util_format_is_pure_integer(format) &&
-             !util_format_is_depth_or_stencil(format) &&
-             util_max_layer(info->src.resource, 0) == 0))
-               return false;
-
-       /* Hardware MSAA resolve doesn't work if SPI format = NORM16_ABGR and
-        * the format is R16G16. Use R16A16, which does work.
-        */
-       if (format == PIPE_FORMAT_R16G16_UNORM)
-               format = PIPE_FORMAT_R16A16_UNORM;
-       if (format == PIPE_FORMAT_R16G16_SNORM)
-               format = PIPE_FORMAT_R16A16_SNORM;
-
-       /* Check the remaining requirements for hw resolve. */
-       if (util_max_layer(info->dst.resource, info->dst.level) == 0 &&
-           !info->scissor_enable &&
-           (info->mask & PIPE_MASK_RGBA) == PIPE_MASK_RGBA &&
-           util_is_format_compatible(util_format_description(info->src.format),
-                                     util_format_description(info->dst.format)) &&
-           dst_width == info->src.resource->width0 &&
-           dst_height == info->src.resource->height0 &&
-           info->dst.box.x == 0 &&
-           info->dst.box.y == 0 &&
-           info->dst.box.width == dst_width &&
-           info->dst.box.height == dst_height &&
-           info->dst.box.depth == 1 &&
-           info->src.box.x == 0 &&
-           info->src.box.y == 0 &&
-           info->src.box.width == dst_width &&
-           info->src.box.height == dst_height &&
-           info->src.box.depth == 1 &&
-           !dst->surface.is_linear &&
-           (!dst->cmask.size || !dst->dirty_level_mask)) { /* dst cannot be fast-cleared */
-               /* Check the last constraint. */
-               if (src->surface.micro_tile_mode != dst->surface.micro_tile_mode) {
-                       /* The next fast clear will switch to this mode to
-                        * get direct hw resolve next time if the mode is
-                        * different now.
-                        */
-                       src->last_msaa_resolve_target_micro_mode =
-                               dst->surface.micro_tile_mode;
-                       goto resolve_to_temp;
-               }
-
-               /* Resolving into a surface with DCC is unsupported. Since
-                * it's being overwritten anyway, clear it to uncompressed.
-                * This is still the fastest codepath even with this clear.
-                */
-               if (vi_dcc_enabled(dst, info->dst.level)) {
-                       /* TODO: Implement per-level DCC clears for GFX9. */
-                       if (sctx->b.chip_class >= GFX9 &&
-                           info->dst.resource->last_level != 0)
-                               goto resolve_to_temp;
-
-                       vi_dcc_clear_level(&sctx->b, dst, info->dst.level,
-                                          0xFFFFFFFF);
-                       dst->dirty_level_mask &= ~(1 << info->dst.level);
-               }
-
-               /* Resolve directly from src to dst. */
-               si_do_CB_resolve(sctx, info, info->dst.resource,
-                                info->dst.level, info->dst.box.z, format);
-               return true;
-       }
+   /* Required before and after CB_RESOLVE. */
+   sctx->flags |= SI_CONTEXT_FLUSH_AND_INV_CB;
 
-resolve_to_temp:
-       /* Shader-based resolve is VERY SLOW. Instead, resolve into
-        * a temporary texture and blit.
-        */
-       memset(&templ, 0, sizeof(templ));
-       templ.target = PIPE_TEXTURE_2D;
-       templ.format = info->src.resource->format;
-       templ.width0 = info->src.resource->width0;
-       templ.height0 = info->src.resource->height0;
-       templ.depth0 = 1;
-       templ.array_size = 1;
-       templ.usage = PIPE_USAGE_DEFAULT;
-       templ.flags = R600_RESOURCE_FLAG_FORCE_TILING |
-                     R600_RESOURCE_FLAG_DISABLE_DCC;
-
-       /* The src and dst microtile modes must be the same. */
-       if (src->surface.micro_tile_mode == RADEON_MICRO_MODE_DISPLAY)
-               templ.bind = PIPE_BIND_SCANOUT;
-       else
-               templ.bind = 0;
-
-       tmp = ctx->screen->resource_create(ctx->screen, &templ);
-       if (!tmp)
-               return false;
-       rtmp = (struct r600_texture*)tmp;
-
-       assert(!rtmp->surface.is_linear);
-       assert(src->surface.micro_tile_mode == rtmp->surface.micro_tile_mode);
-
-       /* resolve */
-       si_do_CB_resolve(sctx, info, tmp, 0, 0, format);
-
-       /* blit */
-       blit = *info;
-       blit.src.resource = tmp;
-       blit.src.box.z = 0;
-
-       si_blitter_begin(ctx, SI_BLIT |
-                        (info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND));
-       util_blitter_blit(sctx->blitter, &blit);
-       si_blitter_end(ctx);
-
-       pipe_resource_reference(&tmp, NULL);
-       return true;
+   si_blitter_begin(
+      sctx, SI_COLOR_RESOLVE | (info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND));
+   util_blitter_custom_resolve_color(sctx->blitter, dst, dst_level, dst_z, info->src.resource,
+                                     info->src.box.z, ~0, sctx->custom_blend_resolve, format);
+   si_blitter_end(sctx);
+
+   /* Flush caches for possible texturing. */
+   si_make_CB_shader_coherent(sctx, 1, false, true /* no DCC */);
 }
 
-static void si_blit(struct pipe_context *ctx,
-                   const struct pipe_blit_info *info)
+static bool do_hardware_msaa_resolve(struct pipe_context *ctx, const struct pipe_blit_info *info)
 {
-       struct si_context *sctx = (struct si_context*)ctx;
-       struct r600_texture *rdst = (struct r600_texture *)info->dst.resource;
-
-       if (do_hardware_msaa_resolve(ctx, info)) {
-               return;
-       }
-
-       /* Using SDMA for copying to a linear texture in GTT is much faster.
-        * This improves DRI PRIME performance.
-        *
-        * resource_copy_region can't do this yet, because dma_copy calls it
-        * on failure (recursion).
-        */
-       if (rdst->surface.is_linear &&
-           sctx->b.dma_copy &&
-           util_can_blit_via_copy_region(info, false)) {
-               sctx->b.dma_copy(ctx, info->dst.resource, info->dst.level,
-                                info->dst.box.x, info->dst.box.y,
-                                info->dst.box.z,
-                                info->src.resource, info->src.level,
-                                &info->src.box);
-               return;
-       }
-
-       assert(util_blitter_is_blit_supported(sctx->blitter, info));
-
-       /* The driver doesn't decompress resources automatically while
-        * u_blitter is rendering. */
-       vi_disable_dcc_if_incompatible_format(&sctx->b, info->src.resource,
-                                             info->src.level,
-                                             info->src.format);
-       vi_disable_dcc_if_incompatible_format(&sctx->b, info->dst.resource,
-                                             info->dst.level,
-                                             info->dst.format);
-       si_decompress_subresource(ctx, info->src.resource, info->mask,
-                                 info->src.level,
-                                 info->src.box.z,
-                                 info->src.box.z + info->src.box.depth - 1);
-
-       if (sctx->screen->b.debug_flags & DBG_FORCE_DMA &&
-           util_try_blit_via_copy_region(ctx, info))
-               return;
-
-       si_blitter_begin(ctx, SI_BLIT |
-                        (info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND));
-       util_blitter_blit(sctx->blitter, info);
-       si_blitter_end(ctx);
+   struct si_context *sctx = (struct si_context *)ctx;
+   struct si_texture *src = (struct si_texture *)info->src.resource;
+   struct si_texture *dst = (struct si_texture *)info->dst.resource;
+   ASSERTED struct si_texture *stmp;
+   unsigned dst_width = u_minify(info->dst.resource->width0, info->dst.level);
+   unsigned dst_height = u_minify(info->dst.resource->height0, info->dst.level);
+   enum pipe_format format = info->src.format;
+   struct pipe_resource *tmp, templ;
+   struct pipe_blit_info blit;
+
+   /* Check basic requirements for hw resolve. */
+   if (!(info->src.resource->nr_samples > 1 && info->dst.resource->nr_samples <= 1 &&
+         !util_format_is_pure_integer(format) && !util_format_is_depth_or_stencil(format) &&
+         util_max_layer(info->src.resource, 0) == 0))
+      return false;
+
+   /* Hardware MSAA resolve doesn't work if SPI format = NORM16_ABGR and
+    * the format is R16G16. Use R16A16, which does work.
+    */
+   if (format == PIPE_FORMAT_R16G16_UNORM)
+      format = PIPE_FORMAT_R16A16_UNORM;
+   if (format == PIPE_FORMAT_R16G16_SNORM)
+      format = PIPE_FORMAT_R16A16_SNORM;
+
+   /* Check the remaining requirements for hw resolve. */
+   if (util_max_layer(info->dst.resource, info->dst.level) == 0 && !info->scissor_enable &&
+       (info->mask & PIPE_MASK_RGBA) == PIPE_MASK_RGBA &&
+       util_is_format_compatible(util_format_description(info->src.format),
+                                 util_format_description(info->dst.format)) &&
+       dst_width == info->src.resource->width0 && dst_height == info->src.resource->height0 &&
+       info->dst.box.x == 0 && info->dst.box.y == 0 && info->dst.box.width == dst_width &&
+       info->dst.box.height == dst_height && info->dst.box.depth == 1 && info->src.box.x == 0 &&
+       info->src.box.y == 0 && info->src.box.width == dst_width &&
+       info->src.box.height == dst_height && info->src.box.depth == 1 && !dst->surface.is_linear &&
+       (!dst->cmask_buffer || !dst->dirty_level_mask)) { /* dst cannot be fast-cleared */
+      /* Check the last constraint. */
+      if (src->surface.micro_tile_mode != dst->surface.micro_tile_mode) {
+         /* The next fast clear will switch to this mode to
+          * get direct hw resolve next time if the mode is
+          * different now.
+          *
+          * TODO-GFX10: This does not work in GFX10 because MSAA
+          * is restricted to 64KB_R_X and 64KB_Z_X swizzle modes.
+          * In some cases we could change the swizzle of the
+          * destination texture instead, but the more general
+          * solution is to implement compute shader resolve.
+          */
+         src->last_msaa_resolve_target_micro_mode = dst->surface.micro_tile_mode;
+         goto resolve_to_temp;
+      }
+
+      /* Resolving into a surface with DCC is unsupported. Since
+       * it's being overwritten anyway, clear it to uncompressed.
+       * This is still the fastest codepath even with this clear.
+       */
+      if (vi_dcc_enabled(dst, info->dst.level)) {
+         if (!vi_dcc_clear_level(sctx, dst, info->dst.level, DCC_UNCOMPRESSED))
+            goto resolve_to_temp;
+
+         dst->dirty_level_mask &= ~(1 << info->dst.level);
+      }
+
+      /* Resolve directly from src to dst. */
+      si_do_CB_resolve(sctx, info, info->dst.resource, info->dst.level, info->dst.box.z, format);
+      return true;
+   }
+
+resolve_to_temp:
+   /* Shader-based resolve is VERY SLOW. Instead, resolve into
+    * a temporary texture and blit.
+    */
+   memset(&templ, 0, sizeof(templ));
+   templ.target = PIPE_TEXTURE_2D;
+   templ.format = info->src.resource->format;
+   templ.width0 = info->src.resource->width0;
+   templ.height0 = info->src.resource->height0;
+   templ.depth0 = 1;
+   templ.array_size = 1;
+   templ.usage = PIPE_USAGE_DEFAULT;
+   templ.flags = SI_RESOURCE_FLAG_FORCE_MSAA_TILING | SI_RESOURCE_FLAG_FORCE_MICRO_TILE_MODE |
+                 SI_RESOURCE_FLAG_MICRO_TILE_MODE_SET(src->surface.micro_tile_mode) |
+                 SI_RESOURCE_FLAG_DISABLE_DCC;
+
+   /* The src and dst microtile modes must be the same. */
+   if (sctx->chip_class <= GFX8 && src->surface.micro_tile_mode == RADEON_MICRO_MODE_DISPLAY)
+      templ.bind = PIPE_BIND_SCANOUT;
+   else
+      templ.bind = 0;
+
+   tmp = ctx->screen->resource_create(ctx->screen, &templ);
+   if (!tmp)
+      return false;
+   stmp = (struct si_texture *)tmp;
+
+   assert(!stmp->surface.is_linear);
+   assert(src->surface.micro_tile_mode == stmp->surface.micro_tile_mode);
+
+   /* resolve */
+   si_do_CB_resolve(sctx, info, tmp, 0, 0, format);
+
+   /* blit */
+   blit = *info;
+   blit.src.resource = tmp;
+   blit.src.box.z = 0;
+
+   si_blitter_begin(sctx, SI_BLIT | (info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND));
+   util_blitter_blit(sctx->blitter, &blit);
+   si_blitter_end(sctx);
+
+   pipe_resource_reference(&tmp, NULL);
+   return true;
 }
 
-static boolean si_generate_mipmap(struct pipe_context *ctx,
-                                 struct pipe_resource *tex,
-                                 enum pipe_format format,
-                                 unsigned base_level, unsigned last_level,
-                                 unsigned first_layer, unsigned last_layer)
+static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
 {
-       struct si_context *sctx = (struct si_context*)ctx;
-       struct r600_texture *rtex = (struct r600_texture *)tex;
-
-       if (!util_blitter_is_copy_supported(sctx->blitter, tex, tex))
-               return false;
-
-       /* The driver doesn't decompress resources automatically while
-        * u_blitter is rendering. */
-       vi_disable_dcc_if_incompatible_format(&sctx->b, tex, base_level,
-                                             format);
-       si_decompress_subresource(ctx, tex, PIPE_MASK_RGBAZS,
-                                 base_level, first_layer, last_layer);
-
-       /* Clear dirty_level_mask for the levels that will be overwritten. */
-       assert(base_level < last_level);
-       rtex->dirty_level_mask &= ~u_bit_consecutive(base_level + 1,
-                                                    last_level - base_level);
-
-       sctx->generate_mipmap_for_depth = rtex->is_depth;
-
-       si_blitter_begin(ctx, SI_BLIT | SI_DISABLE_RENDER_COND);
-       util_blitter_generate_mipmap(sctx->blitter, tex, format,
-                                    base_level, last_level,
-                                    first_layer, last_layer);
-       si_blitter_end(ctx);
-
-       sctx->generate_mipmap_for_depth = false;
-       return true;
+   struct si_context *sctx = (struct si_context *)ctx;
+   struct si_texture *dst = (struct si_texture *)info->dst.resource;
+
+   if (do_hardware_msaa_resolve(ctx, info)) {
+      return;
+   }
+
+   /* Using SDMA for copying to a linear texture in GTT is much faster.
+    * This improves DRI PRIME performance.
+    *
+    * resource_copy_region can't do this yet, because dma_copy calls it
+    * on failure (recursion).
+    */
+   if (dst->surface.is_linear && util_can_blit_via_copy_region(info, false)) {
+      sctx->dma_copy(ctx, info->dst.resource, info->dst.level, info->dst.box.x, info->dst.box.y,
+                     info->dst.box.z, info->src.resource, info->src.level, &info->src.box);
+      return;
+   }
+
+   assert(util_blitter_is_blit_supported(sctx->blitter, info));
+
+   /* The driver doesn't decompress resources automatically while
+    * u_blitter is rendering. */
+   vi_disable_dcc_if_incompatible_format(sctx, info->src.resource, info->src.level,
+                                         info->src.format);
+   vi_disable_dcc_if_incompatible_format(sctx, info->dst.resource, info->dst.level,
+                                         info->dst.format);
+   si_decompress_subresource(ctx, info->src.resource, PIPE_MASK_RGBAZS, info->src.level,
+                             info->src.box.z, info->src.box.z + info->src.box.depth - 1);
+
+   if (sctx->screen->debug_flags & DBG(FORCE_SDMA) && util_try_blit_via_copy_region(ctx, info))
+      return;
+
+   si_blitter_begin(sctx, SI_BLIT | (info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND));
+   util_blitter_blit(sctx->blitter, info);
+   si_blitter_end(sctx);
 }
 
-static void si_flush_resource(struct pipe_context *ctx,
-                             struct pipe_resource *res)
+static bool si_generate_mipmap(struct pipe_context *ctx, struct pipe_resource *tex,
+                               enum pipe_format format, unsigned base_level, unsigned last_level,
+                               unsigned first_layer, unsigned last_layer)
 {
-       struct r600_texture *rtex = (struct r600_texture*)res;
-
-       assert(res->target != PIPE_BUFFER);
-       assert(!rtex->dcc_separate_buffer || rtex->dcc_gather_statistics);
-
-       /* st/dri calls flush twice per frame (not a bug), this prevents double
-        * decompression. */
-       if (rtex->dcc_separate_buffer && !rtex->separate_dcc_dirty)
-               return;
-
-       if (!rtex->is_depth && (rtex->cmask.size || rtex->dcc_offset)) {
-               si_blit_decompress_color(ctx, rtex, 0, res->last_level,
-                                        0, util_max_layer(res, 0),
-                                        rtex->dcc_separate_buffer != NULL);
-       }
-
-       /* Always do the analysis even if DCC is disabled at the moment. */
-       if (rtex->dcc_gather_statistics && rtex->separate_dcc_dirty) {
-               rtex->separate_dcc_dirty = false;
-               vi_separate_dcc_process_and_reset_stats(ctx, rtex);
-       }
+   struct si_context *sctx = (struct si_context *)ctx;
+   struct si_texture *stex = (struct si_texture *)tex;
+
+   if (!util_blitter_is_copy_supported(sctx->blitter, tex, tex))
+      return false;
+
+   /* The driver doesn't decompress resources automatically while
+    * u_blitter is rendering. */
+   vi_disable_dcc_if_incompatible_format(sctx, tex, base_level, format);
+   si_decompress_subresource(ctx, tex, PIPE_MASK_RGBAZS, base_level, first_layer, last_layer);
+
+   /* Clear dirty_level_mask for the levels that will be overwritten. */
+   assert(base_level < last_level);
+   stex->dirty_level_mask &= ~u_bit_consecutive(base_level + 1, last_level - base_level);
+
+   sctx->generate_mipmap_for_depth = stex->is_depth;
+
+   si_blitter_begin(sctx, SI_BLIT | SI_DISABLE_RENDER_COND);
+   util_blitter_generate_mipmap(sctx->blitter, tex, format, base_level, last_level, first_layer,
+                                last_layer);
+   si_blitter_end(sctx);
+
+   sctx->generate_mipmap_for_depth = false;
+   return true;
 }
 
-static void si_decompress_dcc(struct pipe_context *ctx,
-                             struct r600_texture *rtex)
+static void si_flush_resource(struct pipe_context *ctx, struct pipe_resource *res)
 {
-       if (!rtex->dcc_offset)
-               return;
-
-       si_blit_decompress_color(ctx, rtex, 0, rtex->resource.b.b.last_level,
-                                0, util_max_layer(&rtex->resource.b.b, 0),
-                                true);
+   struct si_context *sctx = (struct si_context *)ctx;
+   struct si_texture *tex = (struct si_texture *)res;
+
+   assert(res->target != PIPE_BUFFER);
+   assert(!tex->dcc_separate_buffer || tex->dcc_gather_statistics);
+
+   /* st/dri calls flush twice per frame (not a bug), this prevents double
+    * decompression. */
+   if (tex->dcc_separate_buffer && !tex->separate_dcc_dirty)
+      return;
+
+   if (!tex->is_depth && (tex->cmask_buffer || vi_dcc_enabled(tex, 0))) {
+      si_blit_decompress_color(sctx, tex, 0, res->last_level, 0, util_max_layer(res, 0),
+                               tex->dcc_separate_buffer != NULL, false);
+
+      if (tex->surface.display_dcc_offset && tex->displayable_dcc_dirty) {
+         si_retile_dcc(sctx, tex);
+         tex->displayable_dcc_dirty = false;
+      }
+   }
+
+   /* Always do the analysis even if DCC is disabled at the moment. */
+   if (tex->dcc_gather_statistics) {
+      bool separate_dcc_dirty = tex->separate_dcc_dirty;
+
+      /* If the color buffer hasn't been unbound and fast clear hasn't
+       * been used, separate_dcc_dirty is false, but there may have been
+       * new rendering. Check if the color buffer is bound and assume
+       * it's dirty.
+       *
+       * Note that DRI2 never unbinds window colorbuffers, which means
+       * the DCC pipeline statistics query would never be re-set and would
+       * keep adding new results until all free memory is exhausted if we
+       * didn't do this.
+       */
+      if (!separate_dcc_dirty) {
+         for (unsigned i = 0; i < sctx->framebuffer.state.nr_cbufs; i++) {
+            if (sctx->framebuffer.state.cbufs[i] &&
+                sctx->framebuffer.state.cbufs[i]->texture == res) {
+               separate_dcc_dirty = true;
+               break;
+            }
+         }
+      }
+
+      if (separate_dcc_dirty) {
+         tex->separate_dcc_dirty = false;
+         vi_separate_dcc_process_and_reset_stats(ctx, tex);
+      }
+   }
 }
 
-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)
+void si_decompress_dcc(struct si_context *sctx, struct si_texture *tex)
 {
-       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);
+   /* If graphics is disabled, we can't decompress DCC, but it shouldn't
+    * be compressed either. The caller should simply discard it.
+    */
+   if (!tex->surface.dcc_offset || !sctx->has_graphics)
+      return;
+
+   if (sctx->chip_class == GFX8) {
+      si_blit_decompress_color(sctx, tex, 0, tex->buffer.b.b.last_level, 0,
+                               util_max_layer(&tex->buffer.b.b, 0), true, false);
+   } else {
+      struct pipe_resource *ptex = &tex->buffer.b.b;
+
+      /* DCC decompression using a compute shader. */
+      for (unsigned level = 0; level < tex->surface.num_dcc_levels; level++) {
+         struct pipe_box box;
+
+         u_box_3d(0, 0, 0, u_minify(ptex->width0, level),
+                  u_minify(ptex->height0, level),
+                  util_num_layers(ptex, level), &box);
+         si_compute_copy_image(sctx, ptex, level, ptex, level, 0, 0, 0, &box,
+                               true);
+      }
+
+      /* Now clear DCC metadata to uncompressed. */
+      uint32_t clear_value = DCC_UNCOMPRESSED;
+      si_clear_buffer(sctx, ptex, tex->surface.dcc_offset,
+                      tex->surface.dcc_size, &clear_value, 4,
+                      SI_COHERENCY_CB_META, false);
+   }
 }
 
 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;
+   sctx->b.resource_copy_region = si_resource_copy_region;
+
+   if (sctx->has_graphics) {
+      sctx->b.blit = si_blit;
+      sctx->b.flush_resource = si_flush_resource;
+      sctx->b.generate_mipmap = si_generate_mipmap;
+   }
 }