summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2015-12-06 14:30:44 +1100
committerTimothy Arceri <[email protected]>2015-12-07 21:41:00 +1100
commitda1a01361b0b4b9c727aa9a5a2ebe270a6fa81b7 (patch)
treee6d207bbe456233580093970fd3a0c4e8c8bb738 /src/mesa
parent41e82f4f96f87e3b5bd3e7a3dc221cf6e6b6ae0b (diff)
glsl: re-validate program pipeline after sampler change
Cc: "11.1" <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Cc: Kenneth Graunke <[email protected]> https://bugs.freedesktop.org/show_bug.cgi?id=93180
Diffstat (limited to 'src/mesa')
-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()) {