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

radv: gather layer 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:09:00 +02:00
parent 84b346eda9
commit 1877e87f1e
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2788,10 +2788,6 @@ handle_vs_outputs_post(struct radv_shader_context *ctx,
sizeof(outinfo->vs_output_param_offset)); sizeof(outinfo->vs_output_param_offset));
outinfo->pos_exports = 0; outinfo->pos_exports = 0;
if (ctx->output_mask & (1ull << VARYING_SLOT_LAYER)) {
outinfo->writes_layer = true;
}
if (ctx->shader_info->so.num_outputs && if (ctx->shader_info->so.num_outputs &&
!ctx->is_gs_copy_shader) { !ctx->is_gs_copy_shader) {
/* The GS copy shader emission already emits streamout. */ /* The GS copy shader emission already emits streamout. */
@@ -3506,10 +3502,6 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
tmp = LLVMBuildZExt(builder, tmp, ctx->ac.i32, ""); tmp = LLVMBuildZExt(builder, tmp, ctx->ac.i32, "");
const LLVMValueRef vertexptr = ngg_gs_vertex_ptr(ctx, tmp); const LLVMValueRef vertexptr = ngg_gs_vertex_ptr(ctx, tmp);
if (ctx->output_mask & (1ull << VARYING_SLOT_LAYER)) {
outinfo->writes_layer = true;
}
unsigned out_idx = 0; unsigned out_idx = 0;
gep_idx[1] = ctx->ac.i32_0; gep_idx[1] = ctx->ac.i32_0;
for (unsigned i = 0; i < AC_LLVM_MAX_OUTPUTS; ++i) { for (unsigned i = 0; i < AC_LLVM_MAX_OUTPUTS; ++i) {
@@ -3544,8 +3536,6 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
/* Export ViewIndex. */ /* Export ViewIndex. */
if (export_view_index) { if (export_view_index) {
outinfo->writes_layer = true;
outputs[noutput].slot_name = VARYING_SLOT_LAYER; outputs[noutput].slot_name = VARYING_SLOT_LAYER;
outputs[noutput].slot_index = 0; outputs[noutput].slot_index = 0;
outputs[noutput].usage_mask = 0x1; outputs[noutput].usage_mask = 0x1;

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

@@ -574,6 +574,9 @@ gather_info_output_decl(const nir_shader *nir, const nir_variable *var,
case VARYING_SLOT_VIEWPORT: case VARYING_SLOT_VIEWPORT:
vs_info->writes_viewport_index = true; vs_info->writes_viewport_index = true;
break; break;
case VARYING_SLOT_LAYER:
vs_info->writes_layer = true;
break;
default: default:
break; break;
} }
@@ -667,6 +670,23 @@ radv_nir_shader_info_pass(const struct nir_shader *nir,
} }
} }
/* Make sure to export the LayerID if the subpass has multiviews. */
if (options->key.has_multiview_view_index) {
switch (nir->info.stage) {
case MESA_SHADER_VERTEX:
info->vs.outinfo.writes_layer = true;
break;
case MESA_SHADER_TESS_EVAL:
info->tes.outinfo.writes_layer = true;
break;
case MESA_SHADER_GEOMETRY:
info->vs.outinfo.writes_layer = true;
break;
default:
break;
}
}
if (nir->info.stage == MESA_SHADER_FRAGMENT) if (nir->info.stage == MESA_SHADER_FRAGMENT)
info->ps.num_interp = nir->num_inputs; info->ps.num_interp = nir->num_inputs;