KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: remove redundant si_shader_info::const_buffers_declared 

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6624>
This commit is contained in:
Marek Olšák 2020-09-06 02:15:51 -04:00 committed by Marge Bot
parent 0dabcb9e53
commit d15a7d16d6
7 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_compute_prim_discard.c
View File

@ -308,7 +308,7 @@ void si_build_prim_discard_compute_shader(struct si_shader_context *ctx)
LLVMSetLinkage(vs, LLVMPrivateLinkage);
enum ac_arg_type const_desc_type;
if (ctx->shader->selector->info.const_buffers_declared == 1 &&
if (ctx->shader->selector->info.base.num_ubos == 1 &&
ctx->shader->selector->info.base.num_ssbos == 0)
const_desc_type = AC_ARG_CONST_FLOAT_PTR;
else

2
src/gallium/drivers/radeonsi/si_debug.c
View File

@ -789,7 +789,7 @@ static void si_dump_descriptors(struct si_context *sctx, gl_shader_stage stage,
unsigned enabled_images;
if (info) {
enabled_constbuf = info->const_buffers_declared;
enabled_constbuf = u_bit_consecutive(0, info->base.num_ubos);
enabled_shaderbuf = u_bit_consecutive(0, info->base.num_ssbos);
enabled_samplers = info->base.textures_used;
enabled_images = u_bit_consecutive(0, info->base.num_images);

4
src/gallium/drivers/radeonsi/si_shader.c
View File

@ -229,7 +229,7 @@ static void declare_const_and_shader_buffers(struct si_shader_context *ctx, bool
{
enum ac_arg_type const_shader_buf_type;
if (ctx->shader->selector->info.const_buffers_declared == 1 &&
if (ctx->shader->selector->info.base.num_ubos == 1 &&
ctx->shader->selector->info.base.num_ssbos == 0)
const_shader_buf_type = AC_ARG_CONST_FLOAT_PTR;
else
@ -1342,7 +1342,7 @@ static bool si_build_main_function(struct si_shader_context *ctx, struct si_shad
ctx->shader = shader;
ctx->stage = sel->info.stage;
ctx->num_const_buffers = util_last_bit(info->const_buffers_declared);
ctx->num_const_buffers = info->base.num_ubos;
ctx->num_shader_buffers = info->base.num_ssbos;
ctx->num_samplers = util_last_bit(info->base.textures_used);

1
src/gallium/drivers/radeonsi/si_shader.h
View File

@ -335,7 +335,6 @@ struct si_shader_info {
ubyte color_interpolate_loc[2];
int constbuf0_num_slots;
unsigned const_buffers_declared; /**< bitmask of declared const buffers */
ubyte num_stream_output_components[4];
uint num_memory_instructions; /**< sampler, buffer, and image instructions */

2
src/gallium/drivers/radeonsi/si_shader_llvm_resources.c
View File

@ -93,7 +93,7 @@ static LLVMValueRef load_ubo(struct ac_shader_abi *abi, LLVMValueRef index)
LLVMValueRef ptr = ac_get_arg(&ctx->ac, ctx->const_and_shader_buffers);
if (sel->info.const_buffers_declared == 1 && sel->info.base.num_ssbos == 0) {
if (sel->info.base.num_ubos == 1 && sel->info.base.num_ssbos == 0) {
return load_const_buffer_desc_fast_path(ctx);
}

2
src/gallium/drivers/radeonsi/si_shader_nir.c
View File

@ -479,8 +479,6 @@ void si_nir_scan_shader(const struct nir_shader *nir, struct si_shader_info *inf
}
info->constbuf0_num_slots = nir->num_uniforms;
info->const_buffers_declared = u_bit_consecutive(0, nir->info.num_ubos);
info->num_written_clipdistance = nir->info.clip_distance_array_size;
info->num_written_culldistance = nir->info.cull_distance_array_size;
info->clipdist_writemask = u_bit_consecutive(0, info->num_written_clipdistance);

2
src/gallium/drivers/radeonsi/si_state_shaders.c
View File

@ -2544,7 +2544,7 @@ void si_get_active_slot_masks(const struct si_shader_info *info, uint64_t *const
unsigned start, num_shaderbufs, num_constbufs, num_images, num_msaa_images, num_samplers;
num_shaderbufs = info->base.num_ssbos;
num_constbufs = util_last_bit(info->const_buffers_declared);
num_constbufs = info->base.num_ubos;
/* two 8-byte images share one 16-byte slot */
num_images = align(info->base.num_images, 2);
num_msaa_images = align(util_last_bit(info->base.msaa_images), 2);