Changeset 169654 in webkit

Timestamp:

Jun 6, 2014 11:37:08 AM (10 years ago)

Author:

dino@apple.com

Message:

[iOS WebGL] Float texture extension has a slightly different name
​https://bugs.webkit.org/show_bug.cgi?id=133580
<rdar://problem/17113451>

Reviewed by Brady Eidson.

Floating point textures were not available on iOS, because we were
looking for the wrong extension.

Covered by the Khronos test (and in LayoutTests):
conformance/extensions/oes-texture-float.html

• platform/graphics/opengl/Extensions3DOpenGL.cpp:

(WebCore::Extensions3DOpenGL::supportsExtension): Look for GL_OES_texture_float
as well as GL_ARB_texture_float.

• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::texImage2D): Increase the set of things skipped
on PLATFORM(IOS) since they are supported natively there.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opengl/Extensions3DOpenGL.cpp (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-06  Dean Jackson  <dino@apple.com>
+
+        [iOS WebGL] Float texture extension has a slightly different name
+        https://bugs.webkit.org/show_bug.cgi?id=133580
+        <rdar://problem/17113451>
+
+        Reviewed by Brady Eidson.
+
+        Floating point textures were not available on iOS, because we were
+        looking for the wrong extension.
+
+        Covered by the Khronos test (and in LayoutTests):
+        conformance/extensions/oes-texture-float.html
+
+        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+        (WebCore::Extensions3DOpenGL::supportsExtension): Look for GL_OES_texture_float
+        as well as GL_ARB_texture_float.
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::texImage2D): Increase the set of things skipped
+        on PLATFORM(IOS) since they are supported natively there.
+
 2014-06-05  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

@@ -178 +178 @@
         return true;
 
-    // If GL_ARB_texture_float is available then we report GL_OES_texture_float,
+    // If GL_ARB_texture_float or GL_OES_texture_float is available then we report
     // GL_OES_texture_half_float, GL_OES_texture_float_linear and GL_OES_texture_half_float_linear as available.
     if (name == "GL_OES_texture_float" || name == "GL_OES_texture_half_float" || name == "GL_OES_texture_float_linear" || name == "GL_OES_texture_half_float_linear")
-        return m_availableExtensions.contains("GL_ARB_texture_float");
+        return m_availableExtensions.contains("GL_ARB_texture_float") || m_availableExtensions.contains("GL_OES_texture_float");
 
     // GL_OES_vertex_array_object

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

@@ -295 +295 @@
 
     GC3Denum openGLInternalFormat = internalformat;
+#if !PLATFORM(IOS)
     if (type == GL_FLOAT) {
         if (format == GL_RGBA)
@@ -301 +302 @@
             openGLInternalFormat = GL_RGB32F_ARB;
     } else if (type == HALF_FLOAT_OES) {
-#if !PLATFORM(IOS)
         if (format == GL_RGBA)
             openGLInternalFormat = GL_RGBA16F_ARB;
@@ -313 +313 @@
             openGLInternalFormat = GL_LUMINANCE_ALPHA16F_ARB;
         type = GL_HALF_FLOAT_ARB;
-#endif
-    }
+    }
+#endif
     texImage2DDirect(target, level, openGLInternalFormat, width, height, border, format, type, pixels);
     return true;