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

ac/llvm: remove ac_shader_abi::emit_outputs

Browse Source 
it's called last in ac_nir_translate, so call it in the caller.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16467>
This commit is contained in:
Marek Olšák
2022-05-05 20:36:55 -04:00
parent 9a8413aaea
commit dc81f0ba46
9 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gallium/drivers/radeonsi/si_shader_llvm.c
View File

@@ -1029,6 +1029,47 @@ bool si_llvm_translate_nir(struct si_shader_context *ctx, struct si_shader *shad
ac_nir_translate(&ctx->ac, &ctx->abi, &ctx->args, nir);
switch (sel->stage) {
case MESA_SHADER_VERTEX:
if (shader->key.ge.as_ls)
si_llvm_emit_ls_epilogue(&ctx->abi);
else if (shader->key.ge.as_es)
si_llvm_emit_es_epilogue(&ctx->abi);
else if (ngg_cull_shader)
gfx10_emit_ngg_culling_epilogue(&ctx->abi);
else if (shader->key.ge.as_ngg)
gfx10_emit_ngg_epilogue(&ctx->abi);
else
si_llvm_emit_vs_epilogue(&ctx->abi);
break;
case MESA_SHADER_TESS_CTRL:
si_llvm_emit_tcs_epilogue(&ctx->abi);
break;
case MESA_SHADER_TESS_EVAL:
if (ctx->shader->key.ge.as_es)
si_llvm_emit_es_epilogue(&ctx->abi);
else if (ngg_cull_shader)
gfx10_emit_ngg_culling_epilogue(&ctx->abi);
else if (ctx->shader->key.ge.as_ngg)
gfx10_emit_ngg_epilogue(&ctx->abi);
else
si_llvm_emit_vs_epilogue(&ctx->abi);
break;
case MESA_SHADER_GEOMETRY:
si_llvm_emit_gs_epilogue(&ctx->abi);
break;
case MESA_SHADER_FRAGMENT:
si_llvm_return_fs_outputs(&ctx->abi);
break;
default:
break;
}
si_llvm_build_ret(ctx, ctx->return_value);
if (free_nir)