summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2013-07-11 15:40:11 -0700
committerPaul Berry <stereotype441@gmail.com>2013-07-15 07:50:47 -0700
commitb2265db8e77b531e380c47bb5bf31a3c0aa36e08 (patch)
treefa33f436d54dba768bbc29d12f4bcda4ece652c4 /src/glsl
parentb616d0166158872a135153e27c391424fe655117 (diff)
downloadexternal_mesa3d-b2265db8e77b531e380c47bb5bf31a3c0aa36e08.zip
external_mesa3d-b2265db8e77b531e380c47bb5bf31a3c0aa36e08.tar.gz
external_mesa3d-b2265db8e77b531e380c47bb5bf31a3c0aa36e08.tar.bz2
glsl: Don't allow vertex shader input arrays until GLSL 1.50.
Vertex shader inputs are not allowed to be arrays until GLSL 1.50. We were accidentally enabling them for GLSL 1.40 (although we haven't written any tests for them, so it's not clear whether they actually work). NOTE: although this is a simple bug fix, it probably isn't sensible to cherry-pick it to stable release branches, since its only effect is to cause incorrectly-written shaders to fail to compile. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl')
-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 0120313..28ccf72 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2707,7 +2707,7 @@ ast_declarator_list::hir(exec_list *instructions,
}
if (!error_emitted && var->type->is_array() &&
- !state->check_version(140, 0, &loc,
+ !state->check_version(150, 0, &loc,
"vertex shader input / attribute "
"cannot have array type")) {
error_emitted = true;