summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-06-23 00:16:59 -0400
committerIlia Mirkin <imirkin@alum.mit.edu>2015-06-23 12:08:34 -0400
commitfccf012adc0d3aad877de095244324aa1d2d046a (patch)
treee15ae3850165f5cd294922bc8210f6e3b1a34482
parent59f8d4ee793a1b620fb385f53b4dfe10e4b70f19 (diff)
glsl: binding point is a texture unit, which is a combined space
This fixes compilation failures in Dota 2 Reborn where a texture unit binding point was used that was numerically higher than the max per stage. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au> Tested-by: Nick Sarnie <commendsarnex@gmail.com> Cc: "10.5 10.6" <mesa-stable@lists.freedesktop.org>
-rw-r--r--src/glsl/ast_to_hir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 259e01e0ca..8cb46beab1 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2086,7 +2086,7 @@ validate_binding_qualifier(struct _mesa_glsl_parse_state *state,
* with an array of size N, all elements of the array from binding
* through binding + N - 1 must be within this range."
*/
- unsigned limit = ctx->Const.Program[state->stage].MaxTextureImageUnits;
+ unsigned limit = ctx->Const.MaxCombinedTextureImageUnits;
if (max_index >= limit) {
_mesa_glsl_error(loc, state, "layout(binding = %d) for %d samplers "