<!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>[184605] trunk/Source</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/184605">184605</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2015-05-19 18:01:47 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/181571">r181571</a>): Build broken when USE(OPENGL_ES_2) is defined.
https://bugs.webkit.org/show_bug.cgi?id=145156
Reviewed by Alex Christensen.
Source/ThirdParty/ANGLE:
* include/GLES2/gl2softlinking.h: Revert <a href="http://trac.webkit.org/projects/webkit/changeset/181589">r181589</a>. Vertex Array Objects are not in GLESv2.
Source/WebCore:
No new tests, no behavior changes.
Vertex Array Objects are not available in OpenGLESv2.
Add guards to avoid using this when building with GLESv2.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::createVertexArray):
(WebCore::GraphicsContext3D::deleteVertexArray):
(WebCore::GraphicsContext3D::isVertexArray):
(WebCore::GraphicsContext3D::bindVertexArray):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEincludeGLES2gl2softlinkingh">trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2softlinking.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (184604 => 184605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-05-20 00:57:23 UTC (rev 184604)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-05-20 01:01:47 UTC (rev 184605)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-05-19 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ REGRESSION(r181571): Build broken when USE(OPENGL_ES_2) is defined.
+ https://bugs.webkit.org/show_bug.cgi?id=145156
+
+ Reviewed by Alex Christensen.
+
+ * include/GLES2/gl2softlinking.h: Revert r181589. Vertex Array Objects are not in GLESv2.
+
</ins><span class="cx"> 2015-05-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Move Windows build target to Windows 7 (or newer)
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEincludeGLES2gl2softlinkingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2softlinking.h (184604 => 184605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2softlinking.h 2015-05-20 00:57:23 UTC (rev 184604)
+++ trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2softlinking.h 2015-05-20 01:01:47 UTC (rev 184605)
</span><span class="lines">@@ -158,10 +158,6 @@
</span><span class="cx"> SOFT_LINK(libGLESv2, glUniformMatrix4fv, void, GL_APIENTRY, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value), (location, count, transpose, value));
</span><span class="cx"> SOFT_LINK(libGLESv2, glUseProgram, void, GL_APIENTRY, (GLuint program), (program));
</span><span class="cx"> SOFT_LINK(libGLESv2, glValidateProgram, void, GL_APIENTRY, (GLuint program), (program));
</span><del>-SOFT_LINK(libGLESv2, glBindVertexArray, void, GL_APIENTRY, (GLuint array), (array));
-SOFT_LINK(libGLESv2, glDeleteVertexArrays, void, GL_APIENTRY, (GLsizei n, const GLuint* arrays), (n, arrays));
-SOFT_LINK(libGLESv2, glGenVertexArrays, void, GL_APIENTRY, (GLsizei n, const GLuint* arrays), (n, arrays));
-SOFT_LINK(libGLESv2, glIsVertexArray, GLboolean, GL_APIENTRY, (GLuint array), (array));
</del><span class="cx"> SOFT_LINK(libGLESv2, glVertexAttrib1f, void, GL_APIENTRY, (GLuint indx, GLfloat x), (indx, x));
</span><span class="cx"> SOFT_LINK(libGLESv2, glVertexAttrib1fv, void, GL_APIENTRY, (GLuint indx, const GLfloat* values), (indx, values));
</span><span class="cx"> SOFT_LINK(libGLESv2, glVertexAttrib2f, void, GL_APIENTRY, (GLuint indx, GLfloat x, GLfloat y), (indx, x, y));
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184604 => 184605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-20 00:57:23 UTC (rev 184604)
+++ trunk/Source/WebCore/ChangeLog 2015-05-20 01:01:47 UTC (rev 184605)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-19 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ REGRESSION(r181571): Build broken when USE(OPENGL_ES_2) is defined.
+ https://bugs.webkit.org/show_bug.cgi?id=145156
+
+ Reviewed by Alex Christensen.
+
+ No new tests, no behavior changes.
+
+ Vertex Array Objects are not available in OpenGLESv2.
+ Add guards to avoid using this when building with GLESv2.
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::createVertexArray):
+ (WebCore::GraphicsContext3D::deleteVertexArray):
+ (WebCore::GraphicsContext3D::isVertexArray):
+ (WebCore::GraphicsContext3D::bindVertexArray):
+
</ins><span class="cx"> 2015-05-19 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Upper half of volume control should be filled, not hollow.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (184604 => 184605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-05-20 00:57:23 UTC (rev 184604)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-05-20 01:01:47 UTC (rev 184605)
</span><span class="lines">@@ -1361,7 +1361,7 @@
</span><span class="cx"> {
</span><span class="cx"> makeContextCurrent();
</span><span class="cx"> GLuint array = 0;
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</del><ins>+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><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="cx"> glGenVertexArraysAPPLE(1, &array);
</span><span class="lines">@@ -1375,7 +1375,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> makeContextCurrent();
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</del><ins>+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><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="cx"> glDeleteVertexArraysAPPLE(1, &array);
</span><span class="lines">@@ -1388,7 +1388,7 @@
</span><span class="cx"> return GL_FALSE;
</span><span class="cx">
</span><span class="cx"> makeContextCurrent();
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</del><ins>+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><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="cx"> return glIsVertexArrayAPPLE(array);
</span><span class="lines">@@ -1399,7 +1399,7 @@
</span><span class="cx"> void GraphicsContext3D::bindVertexArray(Platform3DObject array)
</span><span class="cx"> {
</span><span class="cx"> makeContextCurrent();
</span><del>-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</del><ins>+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
</ins><span class="cx"> glBindVertexArray(array);
</span><span class="cx"> #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
</span><span class="cx"> glBindVertexArrayAPPLE(array);
</span></span></pre>
</div>
</div>
</body>
</html>