gallium/nir/tgsi: initialize file_max for inputs
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Tue, 17 Aug 2021 17:42:21 +0000 (19:42 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 19 Aug 2021 10:51:01 +0000 (10:51 +0000)
When this was rewritten to support Vulkan, we stopped initializing
file_max to -1 in the case of no inputs. This causes the draw module
to go down a needlessly pessimistic case, printing an error while we're
at it.

Fixes: 42b5cfdbd26 ("gallivm/nir: fix vulkan vertex inputs")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12440>

src/gallium/auxiliary/nir/nir_to_tgsi_info.c

index 79af7e5..3bb5f1f 100644 (file)
@@ -579,7 +579,7 @@ void nir_tgsi_scan_shader(const struct nir_shader *nir,
          info->indirect_files |= 1 << TGSI_FILE_INPUT;
       info->file_max[TGSI_FILE_INPUT] = info->num_inputs - 1;
    } else {
-      int max = -1;
+      int max = info->file_max[TGSI_FILE_INPUT] = -1;
       nir_foreach_shader_in_variable(var, nir) {
          int slots = glsl_count_attribute_slots(var->type, false);
          int tmax = var->data.driver_location + slots - 1;