Module: Mesa Branch: master Commit: de810f8b84b698e12458c8d793e8f10fead893a4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de810f8b84b698e12458c8d793e8f10fead893a4
Author: Marek Olšák <[email protected]> Date: Thu Oct 5 02:05:33 2017 +0200 radeonsi: remove wrappers si_decompress_xx_textures Reviewed-by: Nicolai Hähnle <[email protected]> --- src/gallium/drivers/radeonsi/si_blit.c | 12 +----------- src/gallium/drivers/radeonsi/si_compute.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.h | 3 +-- src/gallium/drivers/radeonsi/si_state_draw.c | 2 +- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 2e76a5c699..4b7cca6610 100644 --- 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 0a9d4f787d..942750b225 100644 --- 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 684fda1340..97dd875a64 100644 --- 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 2d4c9c5b9f..7fca9a159a 100644 --- 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. * _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
