diff options
Diffstat (limited to 'gfx/angle/src/libANGLE')
| -rwxr-xr-x | gfx/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gfx/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp b/gfx/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp index 87fd24a61..d65e00454 100755 --- a/gfx/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp +++ b/gfx/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp @@ -543,16 +543,11 @@ void GenerateCaps(const FunctionsGL *functions, gl::Caps *caps, gl::TextureCapsM LimitVersion(maxSupportedESVersion, gl::Version(2, 0)); } - // Check if index constant sampler array indexing is supported - if (!functions->isAtLeastGL(gl::Version(4, 0)) && - !functions->isAtLeastGLES(gl::Version(2, 0)) && - !functions->hasExtension("GL_ARB_gpu_shader5")) - { - // This should also be required for ES2 but there are some driver support index constant - // sampler array indexing without meeting the requirements above. Don't limit their ES - // version as it would break WebGL for some users. - LimitVersion(maxSupportedESVersion, gl::Version(2, 0)); - } + // Non-constant sampler array indexing is required for OpenGL ES 2 and OpenGL ES after 3.2. + // However having it available on OpenGL ES 2 is a specification bug, and using this + // indexing in WebGL is undefined. Requiring this feature would break WebGL 1 for some users + // so we don't check for it. (it is present with ESSL 100, ESSL >= 320, GLSL >= 400 and + // GL_ARB_gpu_shader5) // Check if sampler objects are supported if (!functions->isAtLeastGL(gl::Version(3, 3)) && |