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

radv: stop duplicating radv_vs_output_info

Browse Source 
Only the last vertex stage needs to access this.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18210>
This commit is contained in:
Samuel Pitoiset
2022-08-22 19:23:57 +02:00
committed by Marge Bot
parent 45a0276cd1
commit ee5b9bcc57
9 changed files with 42 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1012,9 +1012,10 @@ radv_llvm_export_vs(struct radv_shader_context *ctx, struct radv_shader_output_v
}
static void
handle_vs_outputs_post(struct radv_shader_context *ctx, bool export_clip_dists,
const struct radv_vs_output_info *outinfo)
handle_vs_outputs_post(struct radv_shader_context *ctx)
{
const struct radv_vs_output_info *outinfo = &ctx->shader_info->outinfo;
const bool export_clip_dists = outinfo->export_clip_dists;
struct radv_shader_output_values *outputs;
unsigned noutput = 0;
@@ -1157,8 +1158,7 @@ handle_shader_outputs_post(struct ac_shader_abi *abi)
else if (ctx->shader_info->is_ngg)
break; /* Lowered in NIR */
else
handle_vs_outputs_post(ctx, ctx->shader_info->vs.outinfo.export_clip_dists,
&ctx->shader_info->vs.outinfo);
handle_vs_outputs_post(ctx);
break;
case MESA_SHADER_FRAGMENT:
handle_fs_outputs_post(ctx);
@@ -1177,8 +1177,7 @@ handle_shader_outputs_post(struct ac_shader_abi *abi)
else if (ctx->shader_info->is_ngg)
break; /* Lowered in NIR */
else
handle_vs_outputs_post(ctx, ctx->shader_info->tes.outinfo.export_clip_dists,
&ctx->shader_info->tes.outinfo);
handle_vs_outputs_post(ctx);
break;
default:
break;
@@ -1198,11 +1197,8 @@ static void
radv_llvm_visit_export_vertex(struct ac_shader_abi *abi)
{
struct radv_shader_context *ctx = radv_shader_context_from_abi(abi);
const struct radv_vs_output_info *outinfo = ctx->stage == MESA_SHADER_TESS_EVAL
? &ctx->shader_info->tes.outinfo
: &ctx->shader_info->vs.outinfo;
handle_vs_outputs_post(ctx, outinfo->export_clip_dists, outinfo);
handle_vs_outputs_post(ctx);
}
static void
@@ -1692,8 +1688,7 @@ ac_gs_copy_shader_emit(struct radv_shader_context *ctx)
radv_emit_streamout(ctx, stream);
if (stream == 0) {
handle_vs_outputs_post(ctx, ctx->shader_info->vs.outinfo.export_clip_dists,
&ctx->shader_info->vs.outinfo);
handle_vs_outputs_post(ctx);
}
LLVMBuildBr(ctx->ac.builder, end_bb);