summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2015-12-06 14:30:44 +1100
committerEmil Velikov <emil.l.velikov@gmail.com>2015-12-12 19:39:01 +0000
commitf65b79008987e662f2bb6218cdd251643650db12 (patch)
tree9070e58afe30fd1b43f40349ad2c7c7b4b1c7b2d
parentaa19234943bb254f79f3d3582d3f1fcda2f5b5d6 (diff)
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 (cherry picked from commit da1a01361b0b4b9c727aa9a5a2ebe270a6fa81b7)
-rw-r--r--src/mesa/main/uniform_query.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 083087d6baa..b2ac65fd68f 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()) {