From: Gert Wollny Date: Sun, 28 Feb 2021 20:41:28 +0000 (+0100) Subject: r600/sfn: Fix loading TES gl_PatchVerticesIn X-Git-Tag: upstream/21.2.3~7060 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49b0e8657e2228284fdb92313ee12a89050de13b;p=platform%2Fupstream%2Fmesa.git r600/sfn: Fix loading TES gl_PatchVerticesIn Signed-off-by: Gert Wollny Part-of: --- diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp index d8fb6a6..2f0e0e4 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp @@ -233,7 +233,13 @@ r600_lower_tess_io_impl(nir_builder *b, nir_instr *instr, enum pipe_prim_type pr switch (op->intrinsic) { case nir_intrinsic_load_patch_vertices_in: { - auto vertices_in = nir_channel(b, load_in_param_base, 2); + nir_ssa_def *vertices_in; + if (b->shader->info.stage == MESA_SHADER_TESS_CTRL) + vertices_in = nir_channel(b, load_in_param_base, 2); + else { + auto base = emit_load_param_base(b, nir_intrinsic_load_tcs_in_param_base_r600); + vertices_in = nir_channel(b, base, 2); + } nir_ssa_def_rewrite_uses(&op->dest.ssa, nir_src_for_ssa(vertices_in)); nir_instr_remove(&op->instr); return true;