radeonsi: Set PIPE_SHADER_CAP_MAX_SHADER_IMAGES

[mesa.git] / src / gallium / drivers / radeonsi / si_blit.c

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index e17343fd3d3668bc354538c163e4ac063a0c7985..e0dbec5fb7905ea5545cf67e1cdd3f263f5d4bf3 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -325,8 +325,8 @@ static void si_blit_decompress_color(struct pipe_context *ctx,
 }
 
 static void
-si_decompress_color_textures(struct si_context *sctx,
-                            struct si_textures_info *textures)
+si_decompress_sampler_color_textures(struct si_context *sctx,
+                                    struct si_textures_info *textures)
 {
        unsigned i;
        unsigned mask = textures->compressed_colortex_mask;
@@ -350,18 +350,57 @@ si_decompress_color_textures(struct si_context *sctx,
        }
 }
 
+static void
+si_decompress_image_color_textures(struct si_context *sctx,
+                                  struct si_images_info *images)
+{
+       unsigned i;
+       unsigned mask = images->compressed_colortex_mask;
+
+       while (mask) {
+               const struct pipe_image_view *view;
+               struct r600_texture *tex;
+
+               i = u_bit_scan(&mask);
+
+               view = &images->views[i];
+               assert(view->resource->target != PIPE_BUFFER);
+
+               tex = (struct r600_texture *)view->resource;
+               if (!tex->cmask.size && !tex->fmask.size && !tex->dcc_offset)
+                       continue;
+
+               si_blit_decompress_color(&sctx->b.b, tex,
+                                        view->u.tex.level, view->u.tex.level,
+                                        0, util_max_layer(&tex->resource.b.b, view->u.tex.level),
+                                        false);
+       }
+}
+
 void si_decompress_textures(struct si_context *sctx)
 {
+       unsigned compressed_colortex_counter;
+
        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_compressed_colortex_masks(sctx);
+       }
+
        /* Flush depth textures which need to be flushed. */
        for (int i = 0; i < SI_NUM_SHADERS; i++) {
                if (sctx->samplers[i].depth_texture_mask) {
                        si_flush_depth_textures(sctx, &sctx->samplers[i]);
                }
                if (sctx->samplers[i].compressed_colortex_mask) {
-                       si_decompress_color_textures(sctx, &sctx->samplers[i]);
+                       si_decompress_sampler_color_textures(sctx, &sctx->samplers[i]);
+               }
+               if (sctx->images[i].compressed_colortex_mask) {
+                       si_decompress_image_color_textures(sctx, &sctx->images[i]);
                }
        }
 }