Changeset 169730 in webkit

Timestamp:

Jun 9, 2014 4:32:31 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS WebGL] Fix EXT_shader_texture_lod.
​https://bugs.webkit.org/show_bug.cgi?id=133633

Patch by Alex Christensen <​achristensen@webkit.org> on 2014-06-09
Reviewed by Brady Eidson.

Covered by the Khronos test (and in LayoutTests):
conformance/extensions/ext-shader-texture-lod.html

• html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getSupportedExtensions):
Added shader texture lod name to match value from glGetString(GL_EXTENSIONS) on iOS.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-09  Alex Christensen  <achristensen@webkit.org>
+
+        [iOS WebGL] Fix EXT_shader_texture_lod.
+        https://bugs.webkit.org/show_bug.cgi?id=133633
+
+        Reviewed by Brady Eidson.
+
+        Covered by the Khronos test (and in LayoutTests):
+        conformance/extensions/ext-shader-texture-lod.html
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getExtension):
+        (WebCore::WebGLRenderingContext::getSupportedExtensions):
+        Added shader texture lod name to match value from glGetString(GL_EXTENSIONS) on iOS.
+
 2014-06-09  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -2432 +2432 @@
 
     if (equalIgnoringCase(name, "EXT_shader_texture_lod")
-        && m_context->getExtensions()->supports("GL_ARB_shader_texture_lod")) {
+        && (m_context->getExtensions()->supports("GL_EXT_shader_texture_lod") || m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))) {
         if (!m_extShaderTextureLOD) {
             m_context->getExtensions()->ensureEnabled("GL_EXT_shader_texture_lod");
@@ -3049 +3049 @@
     if (m_context->getExtensions()->supports("GL_OES_standard_derivatives"))
         result.append("OES_standard_derivatives");
-    if (m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))
+    if (m_context->getExtensions()->supports("GL_EXT_shader_texture_lod") || m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))
         result.append("EXT_shader_texture_lod");
     if (m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic"))