radeonsi: remove wrappers si_decompress_xx_textures

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 2e76a5c69987e2b86ad9d2d2ea8666c1560e77b2..4b7cca66102e057b7353cae21dd7d498982443b4 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -771,7 +771,7 @@ static void si_decompress_resident_images(struct si_context *sctx)
        }
 }
 
-static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
+void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
 {
        unsigned compressed_colortex_counter, mask;
 
@@ -816,16 +816,6 @@ static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask
        si_check_render_feedback(sctx);
 }
 
-void si_decompress_graphics_textures(struct si_context *sctx)
-{
-       si_decompress_textures(sctx, u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS));
-}
-
-void si_decompress_compute_textures(struct si_context *sctx)
-{
-       si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE);
-}
-
 static void si_clear(struct pipe_context *ctx, unsigned buffers,
                     const union pipe_color_union *color,
                     double depth, unsigned stencil)

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 0a9d4f787d4fd1758b7c5af7663ce4fff4c388f3..942750b225657ec2b7f2a8b3e36d6c91dcfa09e3 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -787,7 +787,7 @@ static void si_launch_grid(
                sctx->b.last_num_draw_calls = sctx->b.num_draw_calls;
        }
 
-       si_decompress_compute_textures(sctx);
+       si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE);
 
        /* Add buffer sizes for memory checking in need_cs_space. */
        r600_context_add_resource_size(ctx, &program->shader.bo->b.b);

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 684fda13406fa8c8e7e9fdaf67d42cda5e747c46..97dd875a64ebe50344ef31322968bfecd14df4ca 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -505,8 +505,7 @@ void cik_init_sdma_functions(struct si_context *sctx);
 
 /* si_blit.c */
 void si_init_blit_functions(struct si_context *sctx);
-void si_decompress_graphics_textures(struct si_context *sctx);
-void si_decompress_compute_textures(struct si_context *sctx);
+void si_decompress_textures(struct si_context *sctx, unsigned shader_mask);
 void si_resource_copy_region(struct pipe_context *ctx,
                             struct pipe_resource *dst,
                             unsigned dst_level,

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 2d4c9c5b9f3976380b71317ffd1dda47d9adeb55..7fca9a159a4f81ee64ca8fb15ea8fd7a8d72af55 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -1240,7 +1240,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                si_update_all_texture_descriptors(sctx);
        }
 
-       si_decompress_graphics_textures(sctx);
+       si_decompress_textures(sctx, u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS));
 
        /* Set the rasterization primitive type.
         *