<!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>[163858] 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/163858">163858</a></dd>
<dt>Author</dt> <dd>changseok.oh@collabora.com</dd>
<dt>Date</dt> <dd>2014-02-10 21:24:44 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support ANGLE_instanced_arrays for linux
https://bugs.webkit.org/show_bug.cgi?id=127465
Reviewed by Martin Robinson.
Support the instanced drawing WebGL extension, ANGLE_instanced_arrays for linux platform.
This is a following patch for <a href="http://trac.webkit.org/projects/webkit/changeset/162565">r162565</a>. Relevant opengl APIs are exposed
for WebGLRenderingContext to access them.
Covered by fast/canvas/webgl/angle-instanced-arrays.html
* html/canvas/ANGLEInstancedArrays.cpp:
(WebCore::ANGLEInstancedArrays::supported):
* platform/graphics/OpenGLShims.cpp:
(WebCore::initializeOpenGLShims):
* platform/graphics/OpenGLShims.h:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::supportsExtension):
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
(WebCore::GraphicsContext3D::drawArraysInstanced):
(WebCore::GraphicsContext3D::drawElementsInstanced):
(WebCore::GraphicsContext3D::vertexAttribDivisor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasANGLEInstancedArrayscpp">trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsOpenGLShimscpp">trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsOpenGLShimsh">trunk/Source/WebCore/platform/graphics/OpenGLShims.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163857 => 163858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-11 05:17:15 UTC (rev 163857)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 05:24:44 UTC (rev 163858)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-02-10 ChangSeok Oh <changseok.oh@collabora.com>
+
+ Support ANGLE_instanced_arrays for linux
+ https://bugs.webkit.org/show_bug.cgi?id=127465
+
+ Reviewed by Martin Robinson.
+
+ Support the instanced drawing WebGL extension, ANGLE_instanced_arrays for linux platform.
+ This is a following patch for r162565. Relevant opengl APIs are exposed
+ for WebGLRenderingContext to access them.
+
+ Covered by fast/canvas/webgl/angle-instanced-arrays.html
+
+ * html/canvas/ANGLEInstancedArrays.cpp:
+ (WebCore::ANGLEInstancedArrays::supported):
+ * platform/graphics/OpenGLShims.cpp:
+ (WebCore::initializeOpenGLShims):
+ * platform/graphics/OpenGLShims.h:
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::supportsExtension):
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ (WebCore::GraphicsContext3D::drawArraysInstanced):
+ (WebCore::GraphicsContext3D::drawElementsInstanced):
+ (WebCore::GraphicsContext3D::vertexAttribDivisor):
+
</ins><span class="cx"> 2014-02-10 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Removing limitation on JSLock’s lockDropDepth.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasANGLEInstancedArrayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp (163857 => 163858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp 2014-02-11 05:17:15 UTC (rev 163857)
+++ trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp 2014-02-11 05:24:44 UTC (rev 163858)
</span><span class="lines">@@ -28,6 +28,10 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> #include "ANGLEInstancedArrays.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+#include "Extensions3D.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ANGLEInstancedArrays::ANGLEInstancedArrays(WebGLRenderingContext* context)
</span><span class="lines">@@ -49,11 +53,16 @@
</span><span class="cx"> return adoptPtr(new ANGLEInstancedArrays(context));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ANGLEInstancedArrays::supported(WebGLRenderingContext*)
</del><ins>+bool ANGLEInstancedArrays::supported(WebGLRenderingContext* context)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> return true;
</span><ins>+#elif PLATFORM(GTK)
+ Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
+ return extensions->supports("GL_ANGLE_instanced_arrays");
</ins><span class="cx"> #else
</span><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsOpenGLShimscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp (163857 => 163858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-02-11 05:17:15 UTC (rev 163857)
+++ trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-02-11 05:24:44 UTC (rev 163858)
</span><span class="lines">@@ -146,6 +146,8 @@
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY_EXT(glDeleteVertexArrays);
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glDetachShader, success);
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glDisableVertexAttribArray, success);
</span><ins>+ ASSIGN_FUNCTION_TABLE_ENTRY(glDrawArraysInstanced, success);
+ ASSIGN_FUNCTION_TABLE_ENTRY(glDrawElementsInstanced, success);
</ins><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glEnableVertexAttribArray, success);
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glFramebufferRenderbuffer, success);
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glFramebufferTexture2D, success);
</span><span class="lines">@@ -220,6 +222,7 @@
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glVertexAttrib3fv, success);
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glVertexAttrib4f, success);
</span><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glVertexAttrib4fv, success);
</span><ins>+ ASSIGN_FUNCTION_TABLE_ENTRY(glVertexAttribDivisor, success);
</ins><span class="cx"> ASSIGN_FUNCTION_TABLE_ENTRY(glVertexAttribPointer, success);
</span><span class="cx">
</span><span class="cx"> if (!success)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsOpenGLShimsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/OpenGLShims.h (163857 => 163858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/OpenGLShims.h 2014-02-11 05:17:15 UTC (rev 163857)
+++ trunk/Source/WebCore/platform/graphics/OpenGLShims.h 2014-02-11 05:24:44 UTC (rev 163858)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> typedef void (GLAPIENTRY *glDeleteVertexArraysType) (GLsizei, const GLuint*);
</span><span class="cx"> typedef void (GLAPIENTRY *glDetachShaderType) (GLuint, GLuint);
</span><span class="cx"> typedef void (GLAPIENTRY *glDisableVertexAttribArrayType) (GLuint);
</span><ins>+typedef void (GLAPIENTRY *glDrawArraysInstancedType) (GLenum, GLint, GLsizei, GLsizei);
+typedef void (GLAPIENTRY *glDrawElementsInstancedType) (GLenum, GLsizei, GLenum, const GLvoid*, GLsizei);
</ins><span class="cx"> typedef void (GLAPIENTRY *glEnableVertexAttribArrayType) (GLuint);
</span><span class="cx"> typedef void (GLAPIENTRY *glFramebufferRenderbufferType) (GLenum, GLenum, GLenum, GLuint);
</span><span class="cx"> typedef void (GLAPIENTRY *glFramebufferTexture2DType) (GLenum, GLenum, GLenum, GLuint, GLint);
</span><span class="lines">@@ -138,6 +140,7 @@
</span><span class="cx"> typedef void (GLAPIENTRY *glVertexAttrib3fvType) (GLuint, const GLfloat*);
</span><span class="cx"> typedef void (GLAPIENTRY *glVertexAttrib4fType) (GLuint, const GLfloat, const GLfloat, const GLfloat, const GLfloat);
</span><span class="cx"> typedef void (GLAPIENTRY *glVertexAttrib4fvType) (GLuint, const GLfloat*);
</span><ins>+typedef void (GLAPIENTRY *glVertexAttribDivisorType) (GLuint, GLuint);
</ins><span class="cx"> typedef void (GLAPIENTRY *glVertexAttribPointerType) (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid*);
</span><span class="cx">
</span><span class="cx"> #define FUNCTION_TABLE_ENTRY(FunctionName) FunctionName##Type FunctionName
</span><span class="lines">@@ -171,6 +174,8 @@
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glDeleteVertexArrays);
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glDetachShader);
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glDisableVertexAttribArray);
</span><ins>+ FUNCTION_TABLE_ENTRY(glDrawArraysInstanced);
+ FUNCTION_TABLE_ENTRY(glDrawElementsInstanced);
</ins><span class="cx"> FUNCTION_TABLE_ENTRY(glEnableVertexAttribArray);
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glFramebufferRenderbuffer);
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glFramebufferTexture2D);
</span><span class="lines">@@ -240,6 +245,7 @@
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glVertexAttrib3fv);
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glVertexAttrib4f);
</span><span class="cx"> FUNCTION_TABLE_ENTRY(glVertexAttrib4fv);
</span><ins>+ FUNCTION_TABLE_ENTRY(glVertexAttribDivisor);
</ins><span class="cx"> FUNCTION_TABLE_ENTRY(glVertexAttribPointer);
</span><span class="cx"> } OpenGLFunctionTable;
</span><span class="cx">
</span><span class="lines">@@ -282,6 +288,10 @@
</span><span class="cx"> #define glDeleteVertexArrays LOOKUP_GL_FUNCTION(glDeleteVertexArrays)
</span><span class="cx"> #define glDetachShader LOOKUP_GL_FUNCTION(glDetachShader)
</span><span class="cx"> #define glDisableVertexAttribArray LOOKUP_GL_FUNCTION(glDisableVertexAttribArray)
</span><ins>+#define glDrawArraysInstancedEXT glDrawArraysInstanced
+#define glDrawArraysInstanced LOOKUP_GL_FUNCTION(glDrawArraysInstanced)
+#define glDrawElementsInstancedEXT glDrawElementsInstanced
+#define glDrawElementsInstanced LOOKUP_GL_FUNCTION(glDrawElementsInstanced)
</ins><span class="cx"> #define glEnableVertexAttribArray LOOKUP_GL_FUNCTION(glEnableVertexAttribArray)
</span><span class="cx"> #define glFramebufferRenderbufferEXT glFramebufferRenderbuffer
</span><span class="cx"> #define glFramebufferRenderbuffer LOOKUP_GL_FUNCTION(glFramebufferRenderbuffer)
</span><span class="lines">@@ -365,6 +375,8 @@
</span><span class="cx"> #define glVertexAttrib3fv LOOKUP_GL_FUNCTION(glVertexAttrib3fv)
</span><span class="cx"> #define glVertexAttrib4f LOOKUP_GL_FUNCTION(glVertexAttrib4f)
</span><span class="cx"> #define glVertexAttrib4fv LOOKUP_GL_FUNCTION(glVertexAttrib4fv)
</span><ins>+#define glVertexAttribDivisorEXT glVertexAttribDivisor
+#define glVertexAttribDivisor LOOKUP_GL_FUNCTION(glVertexAttribDivisor)
</ins><span class="cx"> #define glVertexAttribPointer LOOKUP_GL_FUNCTION(glVertexAttribPointer)
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (163857 => 163858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-11 05:17:15 UTC (rev 163857)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-11 05:24:44 UTC (rev 163858)
</span><span class="lines">@@ -174,6 +174,11 @@
</span><span class="cx"> if (name == "GL_ANGLE_framebuffer_multisample")
</span><span class="cx"> return m_availableExtensions.contains("GL_EXT_framebuffer_multisample");
</span><span class="cx">
</span><ins>+ if (name == "GL_ANGLE_instanced_arrays") {
+ return (m_availableExtensions.contains("GL_ARB_instanced_arrays") || m_availableExtensions.contains("GL_EXT_instanced_arrays"))
+ && (m_availableExtensions.contains("GL_ARB_draw_instanced") || m_availableExtensions.contains("GL_EXT_draw_instanced"));
+ }
+
</ins><span class="cx"> // Desktop GL always supports GL_OES_rgb8_rgba8.
</span><span class="cx"> if (name == "GL_OES_rgb8_rgba8")
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (163857 => 163858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-02-11 05:17:15 UTC (rev 163857)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-02-11 05:24:44 UTC (rev 163858)
</span><span class="lines">@@ -354,25 +354,20 @@
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(mode);
- UNUSED_PARAM(first);
- UNUSED_PARAM(count);
- UNUSED_PARAM(primcount);
</del><ins>+ makeContextCurrent();
+ ::glDrawArraysInstanced(mode, first, count, primcount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, GC3Dsizei primcount)
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(mode);
- UNUSED_PARAM(count);
- UNUSED_PARAM(type);
- UNUSED_PARAM(offset);
- UNUSED_PARAM(primcount);
</del><ins>+ makeContextCurrent();
+ ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(index);
- UNUSED_PARAM(divisor);
</del><ins>+ makeContextCurrent();
+ ::glVertexAttribDivisor(index, divisor);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>