Commit 2e897091 authored by Ian Romanick's avatar Ian Romanick
Browse files

glsl-1.30: Only require gl_MaxTextureUnits >= 2



Note that the minimum maximum should is 2, but it is incorrectly
listed as 16.  This was fixed in GLSL 1.50 (see page 75 (page 81 of
the PDF)), but the fix was never back ported to 1.30 or 1.40.
Signed-off-by: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: Emma Anholt's avatarEric Anholt <eric@anholt.net>
parent 428fa1b8
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
# Tests for GLSL 1.30 minimum maximums for the builtin constants. # Tests for GLSL 1.30 minimum maximums for the builtin constants.
# #
# See the GLSL 1.30.08 specification, section 7.4, page 67. # See the GLSL 1.30.08 specification, section 7.4, page 67.
#
# Note that the limit should have been 2, but it is incorrectly listed as 16.
# This was fixed in GLSL 1.50 (see page 75 (page 81 of the PDF)), but the fix
# was never back ported to 1.30 or 1.40.
[require] [require]
GLSL >= 1.30 GLSL >= 1.30
...@@ -17,7 +21,7 @@ void main(void) ...@@ -17,7 +21,7 @@ void main(void)
#version 130 #version 130
void main(void) void main(void)
{ {
if (gl_MaxTextureUnits >= 16) if (gl_MaxTextureUnits >= 2)
gl_FragColor = vec4(0, 1, 0, 0); gl_FragColor = vec4(0, 1, 0, 0);
else else
gl_FragColor = vec4(1, 0, 0, 0); gl_FragColor = vec4(1, 0, 0, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment