summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-06-01 16:16:30 +1000
committerDave Airlie <airlied@redhat.com>2016-06-01 17:01:13 +1000
commit0ebf4257a385972be0b6e851383ee6b728515aad (patch)
treefe2bf79f52bf8ea2a428306e43108b1cff67be9a /src
parent6ca118d2f402495e88e5d534773007ac680885a2 (diff)
downloadexternal_mesa3d-0ebf4257a385972be0b6e851383ee6b728515aad.zip
external_mesa3d-0ebf4257a385972be0b6e851383ee6b728515aad.tar.gz
external_mesa3d-0ebf4257a385972be0b6e851383ee6b728515aad.tar.bz2
glsl: define some GLES3 constants in GLSL 4.1
The GLSL 4.1 spec adds: gl_MaxVertexUniformVectors gl_MaxFragmentUniformVectors gl_MaxVaryingVectors This fixes: GL45-CTS.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_build_in_constants Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "12.0 11.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/compiler/glsl/builtin_variables.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp
index d8b6f6e..401c713 100644
--- a/src/compiler/glsl/builtin_variables.cpp
+++ b/src/compiler/glsl/builtin_variables.cpp
@@ -622,7 +622,7 @@ builtin_variable_generator::generate_constants()
/* Max uniforms/varyings: GLSL ES counts these in units of vectors; desktop
* GL counts them in units of "components" or "floats".
*/
- if (state->es_shader) {
+ if (state->is_version(410, 100)) {
add_const("gl_MaxVertexUniformVectors",
state->Const.MaxVertexUniformComponents / 4);
add_const("gl_MaxFragmentUniformVectors",