[Mesa-stable] [PATCH] glsl: re-validate program pipeline after sampler change

[Tapani Pälli]

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 12/06/2015 05:42 AM, Timothy Arceri wrote:
> Cc: "11.1" <mesa-stable at lists.freedesktop.org>
> Cc: Tapani Pälli <tapani.palli at intel.com>
> Cc: Kenneth Graunke <kenneth at whitecape.org>
> https://bugs.freedesktop.org/show_bug.cgi?id=93180
> ---
>   src/mesa/main/uniform_query.cpp | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
> index 083087d..b2ac65f 100644
> --- a/src/mesa/main/uniform_query.cpp
> +++ b/src/mesa/main/uniform_query.cpp
> @@ -758,6 +758,10 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
>               return;
>            }
>         }
> +      /* We need to reset the validate flag on changes to samplers in case
> +       * two different sampler types are set to the same texture unit.
> +       */
> +      ctx->_Shader->Validated = GL_FALSE;
>      }
>
>      if (uni->type->is_image()) {
>