diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2015-12-06 14:30:44 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2015-12-07 21:41:00 +1100 |
| commit | da1a01361b0b4b9c727aa9a5a2ebe270a6fa81b7 (patch) | |
| tree | e6d207bbe456233580093970fd3a0c4e8c8bb738 /src/mesa/main/uniform_query.cpp | |
| parent | 41e82f4f96f87e3b5bd3e7a3dc221cf6e6b6ae0b (diff) | |
| download | external_mesa3d-da1a01361b0b4b9c727aa9a5a2ebe270a6fa81b7.zip external_mesa3d-da1a01361b0b4b9c727aa9a5a2ebe270a6fa81b7.tar.gz external_mesa3d-da1a01361b0b4b9c727aa9a5a2ebe270a6fa81b7.tar.bz2 | |
glsl: re-validate program pipeline after sampler change
Cc: "11.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Cc: Kenneth Graunke <kenneth@whitecape.org>
https://bugs.freedesktop.org/show_bug.cgi?id=93180
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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()) { |