Module: Mesa Branch: main Commit: ac00f5a361ccf8ec9188d0d3256bf2e1ebc767ba URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac00f5a361ccf8ec9188d0d3256bf2e1ebc767ba
Author: Mike Blumenkrantz <[email protected]> Date: Wed Aug 2 13:39:38 2023 -0400 nir/linking_helpers: force type matching in does_varying_match this otherwise breaks when i/o is scalarized in the producer but not the consumer cc: mesa-stable Reviewed-by: Rhys Perry <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24458> --- src/compiler/nir/nir_linking_helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c index 1538311b05f..f9ba20a73f4 100644 --- a/src/compiler/nir/nir_linking_helpers.c +++ b/src/compiler/nir/nir_linking_helpers.c @@ -1001,7 +1001,8 @@ static bool does_varying_match(nir_variable *out_var, nir_variable *in_var) { return in_var->data.location == out_var->data.location && - in_var->data.location_frac == out_var->data.location_frac; + in_var->data.location_frac == out_var->data.location_frac && + in_var->type == out_var->type; } static nir_variable *
