From 233520035a0cf3bee7ed58de6a4fad6cc7e097f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 28 Sep 2020 21:09:40 -0400 Subject: [PATCH] nir: consider load_color intrinsics as both inputs and sysval in gathering src/mesa expects this somewhere. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/compiler/nir/nir_gather_info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index c5863c0f272..dec991a5f62 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -439,6 +439,12 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader, shader->info.fs.color_is_dual_source = true; break; + case nir_intrinsic_load_color0: + case nir_intrinsic_load_color1: + shader->info.inputs_read |= + BITFIELD64_BIT(VARYING_SLOT_COL0 << + (instr->intrinsic == nir_intrinsic_load_color1)); + /* fall through */ case nir_intrinsic_load_subgroup_size: case nir_intrinsic_load_subgroup_invocation: case nir_intrinsic_load_subgroup_eq_mask: @@ -465,8 +471,6 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader, case nir_intrinsic_load_sample_pos: case nir_intrinsic_load_sample_mask_in: case nir_intrinsic_load_helper_invocation: - case nir_intrinsic_load_color0: - case nir_intrinsic_load_color1: case nir_intrinsic_load_tess_coord: case nir_intrinsic_load_patch_vertices_in: case nir_intrinsic_load_primitive_id: