OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: calculate esgs_itemsize in the shader info pass

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset
2019-09-03 18:20:07 +02:00
parent 7fa00e178f
commit f31fb33432
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -2845,22 +2845,8 @@ handle_es_outputs_post(struct radv_shader_context *ctx,
struct radv_es_output_info *outinfo) struct radv_es_output_info *outinfo)
{ {
int j; int j;
uint64_t max_output_written = 0;
LLVMValueRef lds_base = NULL; LLVMValueRef lds_base = NULL;
for (unsigned i = 0; i < AC_LLVM_MAX_OUTPUTS; ++i) {
int param_index;
if (!(ctx->output_mask & (1ull << i)))
continue;
param_index = shader_io_get_unique_index(i);
max_output_written = MAX2(param_index, max_output_written);
}
outinfo->esgs_itemsize = (max_output_written + 1) * 16;
if (ctx->ac.chip_class >= GFX9) { if (ctx->ac.chip_class >= GFX9) {
unsigned itemsize_dw = outinfo->esgs_itemsize / 4; unsigned itemsize_dw = outinfo->esgs_itemsize / 4;
LLVMValueRef vertex_idx = ac_get_thread_id(&ctx->ac); LLVMValueRef vertex_idx = ac_get_thread_id(&ctx->ac);

20
src/amd/vulkan/radv_shader_info.c
View File

@@ -753,4 +753,24 @@ radv_nir_shader_info_pass(const struct nir_shader *nir,
info->gs.max_gsvs_emit_size = info->gs.max_gsvs_emit_size =
info->gs.gsvs_vertex_size * nir->info.gs.vertices_out; info->gs.gsvs_vertex_size * nir->info.gs.vertices_out;
} }
/* Compute the ESGS item size for VS or TES as ES. */
if ((nir->info.stage == MESA_SHADER_VERTEX ||
nir->info.stage == MESA_SHADER_TESS_EVAL) &&
options->key.vs_common_out.as_es) {
struct radv_es_output_info *es_info =
nir->info.stage == MESA_SHADER_VERTEX ? &info->vs.es_info : &info->tes.es_info;
uint32_t max_output_written = 0;
uint64_t output_mask = nir->info.outputs_written;
while (output_mask) {
const int i = u_bit_scan64(&output_mask);
unsigned param_index = shader_io_get_unique_index(i);
max_output_written = MAX2(param_index, max_output_written);
}
es_info->esgs_itemsize = (max_output_written + 1) * 16;
}
} }