[Mesa-dev] [PATCH v2 4/6] glsl: mark xfb inputs as always_active_io

[Eric Anholt]

Timothy Arceri <tarceri at itsqueeze.com> writes:

> We won't split varyings marked as always active because there
> is no point in doing so. This means we need to mark both
> sides of the interface as always active otherwise we will have
> a mismatch and start removing things we shouldn't.
> ---
>  src/compiler/glsl/link_varyings.cpp | 22 +++++++++++++++++++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
> index ed3bf416878..e77ea79e2ba 100644
> --- a/src/compiler/glsl/link_varyings.cpp
> +++ b/src/compiler/glsl/link_varyings.cpp
> @@ -2268,9 +2268,6 @@ assign_varying_locations(struct gl_context *ctx,
>        }
>     }
>  
> -   _mesa_hash_table_destroy(consumer_inputs, NULL);
> -   _mesa_hash_table_destroy(consumer_interface_inputs, NULL);
> -
>     for (unsigned i = 0; i < num_tfeedback_decls; ++i) {
>        if (!tfeedback_decls[i].is_varying())
>           continue;
> @@ -2286,12 +2283,31 @@ assign_varying_locations(struct gl_context *ctx,
>        /* Mark xfb varyings as always active */
>        matched_candidate->toplevel_var->data.always_active_io = 1;
>  
> +      /* Mark the any corresponding inputs as always active also. We must do
> +       * this because we have a NIR pass that lowers vertors to scalars and

*vectors

Other than that,

Reviewed-by: Eric Anholt <eric at anholt.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171012/d8105347/attachment.sig>