summaryrefslogtreecommitdiffstats
path: root/src/glsl/hir_field_selection.cpp
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2012-08-02 08:18:12 -0700
committerIan Romanick <ian.d.romanick@intel.com>2012-12-06 12:13:21 -0800
commitd4a24745b84be49b0ede285ef795847ebca70916 (patch)
tree9fda4f785509bc6d762e74c417438950f6461738 /src/glsl/hir_field_selection.cpp
parent534ec62152e70ed8f6467feaf07b2db2197e11b1 (diff)
downloadexternal_mesa3d-d4a24745b84be49b0ede285ef795847ebca70916.zip
external_mesa3d-d4a24745b84be49b0ede285ef795847ebca70916.tar.gz
external_mesa3d-d4a24745b84be49b0ede285ef795847ebca70916.tar.bz2
glsl: Enable GLSL ES 3.00 features inherited from desktop GLSL.
This patch turns on the following features for GLSL ES 3.00: - Array constructors, whole array assignment, and array comparisons. - Second and third operands of ?: may be arrays. - Use of "in" and "out" qualifiers on globals. - Bitwise and modulus operators. - Integral vertex shader inputs. - Range-checking of literal integers. - array.length method. - Function calls may be constant expressions. - Integral varyings must be qualified with "flat". - Interpolation and centroid qualifiers may not be applied to vertex shader inputs. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'src/glsl/hir_field_selection.cpp')
-rw-r--r--src/glsl/hir_field_selection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp
index a18227f..ac416d5 100644
--- a/src/glsl/hir_field_selection.cpp
+++ b/src/glsl/hir_field_selection.cpp
@@ -72,7 +72,7 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
}
} else if (expr->subexpressions[1] != NULL) {
/* Handle "method calls" in GLSL 1.20 - namely, array.length() */
- state->check_version(120, 0, &loc, "Methods not supported");
+ state->check_version(120, 300, &loc, "Methods not supported");
ast_expression *call = expr->subexpressions[1];
assert(call->oper == ast_function_call);