<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169714] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169714">169714</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-09 14:09:09 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosGraphicsContext3DIOSh">trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLh">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169713 => 169714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-09 21:03:22 UTC (rev 169713)
+++ trunk/Source/WebCore/ChangeLog 2014-06-09 21:09:09 UTC (rev 169714)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-06-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] caption size is not update immediately when system preferences change
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosGraphicsContext3DIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h (169713 => 169714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h 2014-06-09 21:03:22 UTC (rev 169713)
+++ trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h 2014-06-09 21:09:09 UTC (rev 169714)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx"> #define glDrawElementsInstancedARB glDrawElementsInstancedEXT
</span><span class="cx"> #define glVertexAttribDivisorARB glVertexAttribDivisorEXT
</span><span class="cx">
</span><ins>+#define glBindVertexArray glBindVertexArrayOES
+#define glDeleteVertexArrays glDeleteVertexArraysOES
+#define glGenVertexArrays glGenVertexArraysOES
+#define glIsVertexArray glIsVertexArrayOES
+
</ins><span class="cx"> #define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0
</span><span class="cx"> #define GL_DEPTH24_STENCIL8_EXT GL_DEPTH24_STENCIL8_OES
</span><span class="cx"> #define GL_DEPTH_ATTACHMENT_EXT GL_DEPTH_ATTACHMENT
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (169713 => 169714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-06-09 21:03:22 UTC (rev 169713)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-06-09 21:09:09 UTC (rev 169714)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_context->makeContextCurrent();
</span><span class="cx"> GLuint array = 0;
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
</del><ins>+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><span class="cx"> if (isVertexArrayObjectSupported())
</span><span class="cx"> glGenVertexArrays(1, &array);
</span><span class="cx"> #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_context->makeContextCurrent();
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
</del><ins>+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><span class="cx"> if (isVertexArrayObjectSupported())
</span><span class="cx"> glDeleteVertexArrays(1, &array);
</span><span class="cx"> #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> return GL_FALSE;
</span><span class="cx">
</span><span class="cx"> m_context->makeContextCurrent();
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
</del><ins>+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><span class="cx"> if (isVertexArrayObjectSupported())
</span><span class="cx"> return glIsVertexArray(array);
</span><span class="cx"> #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
</span><span class="lines">@@ -126,12 +126,8 @@
</span><span class="cx">
</span><span class="cx"> void Extensions3DOpenGL::bindVertexArrayOES(Platform3DObject array)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
- UNUSED_PARAM(array);
-#endif
-
</del><span class="cx"> m_context->makeContextCurrent();
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
</del><ins>+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><span class="cx"> if (isVertexArrayObjectSupported())
</span><span class="cx"> glBindVertexArray(array);
</span><span class="cx"> #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
</span><span class="lines">@@ -186,6 +182,8 @@
</span><span class="cx"> if (name == "GL_OES_vertex_array_object") {
</span><span class="cx"> #if (PLATFORM(GTK) || PLATFORM(EFL))
</span><span class="cx"> return m_availableExtensions.contains("GL_ARB_vertex_array_object");
</span><ins>+#elif PLATFORM(IOS)
+ return m_availableExtensions.contains("GL_OES_vertex_array_object");
</ins><span class="cx"> #else
</span><span class="cx"> return m_availableExtensions.contains("GL_APPLE_vertex_array_object");
</span><span class="cx"> #endif
</span><span class="lines">@@ -284,7 +282,7 @@
</span><span class="cx"> return String(reinterpret_cast<const char*>(::glGetString(GL_EXTENSIONS)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
</del><ins>+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><span class="cx"> bool Extensions3DOpenGL::isVertexArrayObjectSupported()
</span><span class="cx"> {
</span><span class="cx"> static const bool supportsVertexArrayObject = supports("GL_OES_vertex_array_object");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h (169713 => 169714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2014-06-09 21:03:22 UTC (rev 169713)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2014-06-09 21:09:09 UTC (rev 169714)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool supportsExtension(const WTF::String&);
</span><span class="cx"> virtual String getExtensions();
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN))
</del><ins>+#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><span class="cx"> private:
</span><span class="cx"> bool isVertexArrayObjectSupported();
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>