Changeset 169714 in webkit

Timestamp:

Jun 9, 2014 2:09:09 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS WebGL] Implement OES_vertex_array_object for iOS.
​https://bugs.webkit.org/show_bug.cgi?id=133629

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/oes-vertex-array-object.html

• platform/graphics/ios/GraphicsContext3DIOS.h:

Added OpenGL vertex array function renaming for iOS adding the OES suffix.

• platform/graphics/opengl/Extensions3DOpenGL.cpp:

(WebCore::Extensions3DOpenGL::createVertexArrayOES):
(WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
(WebCore::Extensions3DOpenGL::isVertexArrayOES):
(WebCore::Extensions3DOpenGL::bindVertexArrayOES):
Added isVertexArrayObjectSupported and support for iOS.
(WebCore::Extensions3DOpenGL::supportsExtension):
Added iOS name for GL_OES_vertex_array_object extension.

• platform/graphics/opengl/Extensions3DOpenGL.h:

Added isVertexArrayObjectSupported for iOS.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ios/GraphicsContext3DIOS.h (modified) (1 diff)
• platform/graphics/opengl/Extensions3DOpenGL.cpp (modified) (6 diffs)
• platform/graphics/opengl/Extensions3DOpenGL.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-09  Alex Christensen  <achristensen@webkit.org>
+
+        [iOS WebGL] Implement OES_vertex_array_object for iOS.
+        https://bugs.webkit.org/show_bug.cgi?id=133629
+
+        Reviewed by Brady Eidson.
+
+        Covered by the Khronos test (and in LayoutTests):
+        conformance/extensions/oes-vertex-array-object.html
+
+        * platform/graphics/ios/GraphicsContext3DIOS.h:
+        Added OpenGL vertex array function renaming for iOS adding the OES suffix.
+        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+        (WebCore::Extensions3DOpenGL::createVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::isVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::bindVertexArrayOES):
+        Added isVertexArrayObjectSupported and support for iOS.
+        (WebCore::Extensions3DOpenGL::supportsExtension):
+        Added iOS name for GL_OES_vertex_array_object extension.
+        * platform/graphics/opengl/Extensions3DOpenGL.h:
+        Added isVertexArrayObjectSupported for iOS.        
+
 2014-06-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h

@@ -48 +48 @@
 #define glVertexAttribDivisorARB glVertexAttribDivisorEXT
 
+#define glBindVertexArray glBindVertexArrayOES
+#define glDeleteVertexArrays glDeleteVertexArraysOES
+#define glGenVertexArrays glGenVertexArraysOES
+#define glIsVertexArray glIsVertexArrayOES
+
 #define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0
 #define GL_DEPTH24_STENCIL8_EXT GL_DEPTH24_STENCIL8_OES

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

@@ -87 +87 @@
     m_context->makeContextCurrent();
     GLuint array = 0;
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     if (isVertexArrayObjectSupported())
         glGenVertexArrays(1, &array);
@@ -102 +102 @@
 
     m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     if (isVertexArrayObjectSupported())
         glDeleteVertexArrays(1, &array);
@@ -116 +116 @@
 
     m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     if (isVertexArrayObjectSupported())
         return glIsVertexArray(array);
@@ -127 +127 @@
 void Extensions3DOpenGL::bindVertexArrayOES(Platform3DObject array)
 {
-#if PLATFORM(IOS)
-    UNUSED_PARAM(array);
-#endif
-
-    m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
+    m_context->makeContextCurrent();
+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     if (isVertexArrayObjectSupported())
         glBindVertexArray(array);
@@ -187 +183 @@
 #if (PLATFORM(GTK) || PLATFORM(EFL))
         return m_availableExtensions.contains("GL_ARB_vertex_array_object");
+#elif PLATFORM(IOS)
+        return m_availableExtensions.contains("GL_OES_vertex_array_object");
 #else
         return m_availableExtensions.contains("GL_APPLE_vertex_array_object");
@@ -285 +283 @@
 }
 
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
 bool Extensions3DOpenGL::isVertexArrayObjectSupported()
 {

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

@@ -64 +64 @@
     virtual bool supportsExtension(const WTF::String&);
     virtual String getExtensions();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
 private:
     bool isVertexArrayObjectSupported();