diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-03-18 18:33:28 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-03-18 18:35:48 -0700 |
| commit | ab000ba5978931d016fa8726a3cbd407a61adfe6 (patch) | |
| tree | 054a6c380623ca01436d1ca507ee799438c88453 | |
| parent | 74f7a3b3d23bfc24a81ecf66f801347759f93d57 (diff) | |
Change expected result of TextureRectangleSamplers.frag from 'fail' to 'pass'
Ah my friend texture rectangles. The spec for
GL_ARB_texture_rectangle is a little bit broken because it was
developed before the #extension mechanism existed. Because of this,
shaders do not need to have the '#extension GL_ARB_texture_rectangle:
enable' directive. Issue #15 in the spec says:
15) How does this extension interact with GLSL based on the "OpenGL
Shading Language Extension Conventions"?
Unfortunately, this extension was specified and implemented
contemporaneously with the GLSL Extension Conventions and because
of this timing does not follow its guidance for #extension and
adornment of new GLSL names. Because this extension has both an
API interaction (adding a new rectangle texture target) and a GLSL
interaction (functions and sampler types for accessing texture
rectangles), you can't practically use the GLSL texture rectangle
functionality without the API functionality. For this reason,
detecting the GL_ARB_texture_rectangle string is sufficient for
assuming the GLSL functionality is present.
Conceptually, you can consider the declaration
#extension GL_ARB_texture_rectangle : require, to allow support
for texture rectangles, to be implicitly prepended to every
GLSL shader when ARB_texture_rectangle is advertised.
All future GLSL extensions should follow the "OpenGL Shading Language
Extension Conventions" however.
| -rw-r--r-- | tests/all.tests | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/all.tests b/tests/all.tests index f485085ea..d42de3bc8 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -328,7 +328,7 @@ add_glslparsertest('CGStandardLibrary.frag', 'fail') add_glslparsertest('IncludeDirective.frag', 'fail') add_glslparsertest('MainParameters.vert', 'fail') add_glslparsertest('ConstantConversions.frag', 'fail') -add_glslparsertest('TextureRectangleSamplers.frag', 'fail') +add_glslparsertest('TextureRectangleSamplers.frag', 'pass') add_glslparsertest('FunctionParam.vert', 'fail') add_glslparsertest('ParseTest3.frag', 'fail') add_glslparsertest('ParseTest4.frag', 'fail') |