<!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>[164026] 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/164026">164026</a></dd>
<dt>Author</dt> <dd>changseok.oh@collabora.com</dd>
<dt>Date</dt> <dd>2014-02-13 04:58:54 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support ANGLE_instanced_arrays for GLES backend.
https://bugs.webkit.org/show_bug.cgi?id=128579
Reviewed by Dean Jackson.
Add some APIs to Extensions3D to support ANGLE_instanced_arrays for GLES backend.
At the same time, drawArraysInstanced, drawElementsInstanced and vertexAttribDivisor
are moved from GC3DOpenGL.cpp to GC3DOpenGLCommon.cpp since they could be shareable
through Extensions3D.
Covered by fast/canvas/webgl/angle-instanced-arrays.html
* platform/graphics/Extensions3D.h:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::drawArraysInstanced):
(WebCore::Extensions3DOpenGL::drawElementsInstanced):
(WebCore::Extensions3DOpenGL::vertexAttribDivisor):
* platform/graphics/opengl/Extensions3DOpenGL.h:
* platform/graphics/opengl/Extensions3DOpenGLES.cpp:
(WebCore::Extensions3DOpenGLES::Extensions3DOpenGLES):
(WebCore::Extensions3DOpenGLES::drawArraysInstanced):
(WebCore::Extensions3DOpenGLES::drawElementsInstanced):
(WebCore::Extensions3DOpenGLES::vertexAttribDivisor):
(WebCore::Extensions3DOpenGLES::supportsExtension):
* platform/graphics/opengl/Extensions3DOpenGLES.h:
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::drawArraysInstanced):
(WebCore::GraphicsContext3D::drawElementsInstanced):
(WebCore::GraphicsContext3D::vertexAttribDivisor):
* platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsExtensions3Dh">trunk/Source/WebCore/platform/graphics/Extensions3D.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>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLEScpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLESh">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/ChangeLog 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-02-13 ChangSeok Oh <changseok.oh@collabora.com>
+
+ Support ANGLE_instanced_arrays for GLES backend.
+ https://bugs.webkit.org/show_bug.cgi?id=128579
+
+ Reviewed by Dean Jackson.
+
+ Add some APIs to Extensions3D to support ANGLE_instanced_arrays for GLES backend.
+ At the same time, drawArraysInstanced, drawElementsInstanced and vertexAttribDivisor
+ are moved from GC3DOpenGL.cpp to GC3DOpenGLCommon.cpp since they could be shareable
+ through Extensions3D.
+
+ Covered by fast/canvas/webgl/angle-instanced-arrays.html
+
+ * platform/graphics/Extensions3D.h:
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::drawArraysInstanced):
+ (WebCore::Extensions3DOpenGL::drawElementsInstanced):
+ (WebCore::Extensions3DOpenGL::vertexAttribDivisor):
+ * platform/graphics/opengl/Extensions3DOpenGL.h:
+ * platform/graphics/opengl/Extensions3DOpenGLES.cpp:
+ (WebCore::Extensions3DOpenGLES::Extensions3DOpenGLES):
+ (WebCore::Extensions3DOpenGLES::drawArraysInstanced):
+ (WebCore::Extensions3DOpenGLES::drawElementsInstanced):
+ (WebCore::Extensions3DOpenGLES::vertexAttribDivisor):
+ (WebCore::Extensions3DOpenGLES::supportsExtension):
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::drawArraysInstanced):
+ (WebCore::GraphicsContext3D::drawElementsInstanced):
+ (WebCore::GraphicsContext3D::vertexAttribDivisor):
+ * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+
</ins><span class="cx"> 2014-02-13 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] MEDIA_CONTROLS_SCRIPT support
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsExtensions3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> // GL_CHROMIUM_copy_texture
</span><span class="cx"> // GL_CHROMIUM_flipy
</span><span class="cx"> // GL_ARB_draw_buffers / GL_EXT_draw_buffers
</span><ins>+ // GL_ANGLE_instanced_arrays
</ins><span class="cx">
</span><span class="cx"> // Takes full name of extension; for example,
</span><span class="cx"> // "GL_EXT_texture_format_BGRA8888".
</span><span class="lines">@@ -238,6 +239,11 @@
</span><span class="cx"> // GL_ARB_draw_buffers / GL_EXT_draw_buffers
</span><span class="cx"> virtual void drawBuffersEXT(GC3Dsizei n, const GC3Denum* bufs) = 0;
</span><span class="cx">
</span><ins>+ // GL_ANGLE_instanced_arrays
+ virtual void drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount) = 0;
+ virtual void drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount) = 0;
+ virtual void vertexAttribDivisor(GC3Duint index, GC3Duint divisor) = 0;
+
</ins><span class="cx"> virtual bool isNVIDIA() = 0;
</span><span class="cx"> virtual bool isAMD() = 0;
</span><span class="cx"> virtual bool isIntel() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -236,6 +236,44 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Extensions3DOpenGL::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
+{
+#if ENABLE(GTK)
+ m_context->makeContextCurrent();
+ ::glDrawArraysInstanced(mode, first, count, primcount);
+#else
+ UNUSED_PARAM(mode);
+ UNUSED_PARAM(first);
+ UNUSED_PARAM(count);
+ UNUSED_PARAM(primcount);
+#endif
+}
+
+void Extensions3DOpenGL::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount)
+{
+#if ENABLE(GTK)
+ m_context->makeContextCurrent();
+ ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
+#else
+ UNUSED_PARAM(mode);
+ UNUSED_PARAM(count);
+ UNUSED_PARAM(type);
+ UNUSED_PARAM(offset);
+ UNUSED_PARAM(primcount);
+#endif
+}
+
+void Extensions3DOpenGL::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
+{
+#if ENABLE(GTK)
+ m_context->makeContextCurrent();
+ ::glVertexAttribDivisor(index, divisor);
+#else
+ UNUSED_PARAM(index);
+ UNUSED_PARAM(divisor);
+#endif
+}
+
</ins><span class="cx"> String Extensions3DOpenGL::getExtensions()
</span><span class="cx"> {
</span><span class="cx"> return String(reinterpret_cast<const char*>(::glGetString(GL_EXTENSIONS)));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -53,6 +53,10 @@
</span><span class="cx"> virtual void popGroupMarkerEXT(void);
</span><span class="cx"> virtual void drawBuffersEXT(GC3Dsizei, const GC3Denum*);
</span><span class="cx">
</span><ins>+ virtual void drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount);
+ virtual void drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount);
+ virtual void vertexAttribDivisor(GC3Duint index, GC3Duint divisor);
+
</ins><span class="cx"> protected:
</span><span class="cx"> // This class only needs to be instantiated by GraphicsContext3D implementations.
</span><span class="cx"> friend class GraphicsContext3D;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
</span><ins>+ * Copyright (C) 2014 Collabora Ltd. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -40,6 +41,7 @@
</span><span class="cx"> , m_contextResetStatus(GL_NO_ERROR)
</span><span class="cx"> , m_supportsOESvertexArrayObject(false)
</span><span class="cx"> , m_supportsIMGMultisampledRenderToTexture(false)
</span><ins>+ , m_supportsANGLEinstancedArrays(false)
</ins><span class="cx"> , m_glFramebufferTexture2DMultisampleIMG(0)
</span><span class="cx"> , m_glRenderbufferStorageMultisampleIMG(0)
</span><span class="cx"> , m_glBindVertexArrayOES(0)
</span><span class="lines">@@ -50,6 +52,9 @@
</span><span class="cx"> , m_glReadnPixelsEXT(0)
</span><span class="cx"> , m_glGetnUniformfvEXT(0)
</span><span class="cx"> , m_glGetnUniformivEXT(0)
</span><ins>+ , m_glVertexAttribDivisorANGLE(nullptr)
+ , m_glDrawArraysInstancedANGLE(nullptr)
+ , m_glDrawElementsInstancedANGLE(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -228,6 +233,39 @@
</span><span class="cx"> m_context->synthesizeGLError(GL_INVALID_OPERATION);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Extensions3DOpenGLES::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
+{
+ if (!m_glDrawArraysInstancedANGLE) {
+ m_context->synthesizeGLError(GL_INVALID_OPERATION);
+ return;
+ }
+
+ m_context->makeContextCurrent();
+ m_glDrawArraysInstancedANGLE(mode, first, count, primcount);
+}
+
+void Extensions3DOpenGLES::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount)
+{
+ if (!m_glDrawElementsInstancedANGLE) {
+ m_context->synthesizeGLError(GL_INVALID_OPERATION);
+ return;
+ }
+
+ m_context->makeContextCurrent();
+ m_glDrawElementsInstancedANGLE(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
+}
+
+void Extensions3DOpenGLES::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
+{
+ if (!m_glVertexAttribDivisorANGLE) {
+ m_context->synthesizeGLError(GL_INVALID_OPERATION);
+ return;
+ }
+
+ m_context->makeContextCurrent();
+ m_glVertexAttribDivisorANGLE(index, divisor);
+}
+
</ins><span class="cx"> bool Extensions3DOpenGLES::supportsExtension(const String& name)
</span><span class="cx"> {
</span><span class="cx"> if (m_availableExtensions.contains(name)) {
</span><span class="lines">@@ -246,6 +284,11 @@
</span><span class="cx"> m_glReadnPixelsEXT = reinterpret_cast<PFNGLREADNPIXELSEXTPROC>(eglGetProcAddress("glReadnPixelsEXT"));
</span><span class="cx"> m_glGetnUniformfvEXT = reinterpret_cast<PFNGLGETNUNIFORMFVEXTPROC>(eglGetProcAddress("glGetnUniformfvEXT"));
</span><span class="cx"> m_glGetnUniformivEXT = reinterpret_cast<PFNGLGETNUNIFORMIVEXTPROC>(eglGetProcAddress("glGetnUniformivEXT"));
</span><ins>+ } else if (!m_supportsANGLEinstancedArrays && name == "GL_ANGLE_instanced_arrays") {
+ m_glVertexAttribDivisorANGLE = reinterpret_cast<PFNGLVERTEXATTRIBDIVISORANGLEPROC>(eglGetProcAddress("glVertexAttribDivisorANGLE"));
+ m_glDrawArraysInstancedANGLE = reinterpret_cast<PFNGLDRAWARRAYSINSTANCEDANGLEPROC >(eglGetProcAddress("glDrawArraysInstancedANGLE"));
+ m_glDrawElementsInstancedANGLE = reinterpret_cast<PFNGLDRAWELEMENTSINSTANCEDANGLEPROC >(eglGetProcAddress("glDrawElementsInstancedANGLE"));
+ m_supportsANGLEinstancedArrays = true;
</ins><span class="cx"> } else if (name == "GL_EXT_draw_buffers") {
</span><span class="cx"> // FIXME: implement the support.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLESh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -80,6 +80,10 @@
</span><span class="cx"> virtual void bindVertexArrayOES(Platform3DObject);
</span><span class="cx"> virtual void drawBuffersEXT(GC3Dsizei, const GC3Denum*);
</span><span class="cx">
</span><ins>+ virtual void drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount);
+ virtual void drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount);
+ virtual void vertexAttribDivisor(GC3Duint index, GC3Duint divisor);
+
</ins><span class="cx"> // EXT Robustness - reset
</span><span class="cx"> virtual int getGraphicsResetStatusARB();
</span><span class="cx"> void setEXTContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback>);
</span><span class="lines">@@ -101,6 +105,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_supportsOESvertexArrayObject;
</span><span class="cx"> bool m_supportsIMGMultisampledRenderToTexture;
</span><ins>+ bool m_supportsANGLEinstancedArrays;
</ins><span class="cx">
</span><span class="cx"> PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG m_glFramebufferTexture2DMultisampleIMG;
</span><span class="cx"> PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG m_glRenderbufferStorageMultisampleIMG;
</span><span class="lines">@@ -112,7 +117,11 @@
</span><span class="cx"> PFNGLREADNPIXELSEXTPROC m_glReadnPixelsEXT;
</span><span class="cx"> PFNGLGETNUNIFORMFVEXTPROC m_glGetnUniformfvEXT;
</span><span class="cx"> PFNGLGETNUNIFORMIVEXTPROC m_glGetnUniformivEXT;
</span><ins>+ PFNGLVERTEXATTRIBDIVISORANGLEPROC m_glVertexAttribDivisorANGLE;
+ PFNGLDRAWARRAYSINSTANCEDANGLEPROC m_glDrawArraysInstancedANGLE;
+ PFNGLDRAWELEMENTSINSTANCEDANGLEPROC m_glDrawElementsInstancedANGLE;
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> OwnPtr<GraphicsContext3D::ContextLostCallback> m_contextLostCallback;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -351,26 +351,6 @@
</span><span class="cx"> ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
-void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
-{
- makeContextCurrent();
- ::glDrawArraysInstanced(mode, first, count, primcount);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext3D::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, GC3Dsizei primcount)
-{
- makeContextCurrent();
- ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
-}
-
-void GraphicsContext3D::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
-{
- makeContextCurrent();
- ::glVertexAttribDivisor(index, divisor);
-}
-#endif
-
-}
-
</del><span class="cx"> #endif // USE(3D_GRAPHICS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -1630,6 +1630,23 @@
</span><span class="cx"> ::glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
+{
+ getExtensions()->drawArraysInstanced(mode, first, count, primcount);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsContext3D::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, GC3Dsizei primcount)
+{
+ getExtensions()->drawElementsInstanced(mode, count, type, offset, primcount);
+}
+
+void GraphicsContext3D::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
+{
+ getExtensions()->vertexAttribDivisor(index, divisor);
+}
+#endif
+
+}
+
</ins><span class="cx"> #endif // USE(3D_GRAPHICS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (164025 => 164026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2014-02-13 12:35:44 UTC (rev 164025)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2014-02-13 12:58:54 UTC (rev 164026)
</span><span class="lines">@@ -206,29 +206,6 @@
</span><span class="cx"> ::glClearDepthf(depth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
-{
- UNUSED_PARAM(mode);
- UNUSED_PARAM(first);
- UNUSED_PARAM(count);
- UNUSED_PARAM(primcount);
-}
-
-void GraphicsContext3D::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, GC3Dsizei primcount)
-{
- UNUSED_PARAM(mode);
- UNUSED_PARAM(count);
- UNUSED_PARAM(type);
- UNUSED_PARAM(offset);
- UNUSED_PARAM(primcount);
-}
-
-void GraphicsContext3D::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
-{
- UNUSED_PARAM(index);
- UNUSED_PARAM(divisor);
-}
-
</del><span class="cx"> Extensions3D* GraphicsContext3D::getExtensions()
</span><span class="cx"> {
</span><span class="cx"> if (!m_extensions)
</span></span></pre>
</div>
</div>
</body>
</html>