[webkit-changes] [184605] trunk/Source

Tue, 19 May 2015 18:02:40 -0700

Title: [184605] trunk/Source
Revision
184605
Author
[email protected]
Date
2015-05-19 18:01:47 -0700 (Tue, 19 May 2015)

Log Message

REGRESSION(r181571): 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 r181589. 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):

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (184604 => 184605)


--- 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)
@@ -1,3 +1,12 @@
+2015-05-19  Carlos Alberto Lopez Perez  <[email protected]>
+
+        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.
+
 2015-05-11  Brent Fulgham  <[email protected]>
 
         [Win] Move Windows build target to Windows 7 (or newer)

Modified: trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2softlinking.h (184604 => 184605)


--- 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)
@@ -158,10 +158,6 @@
 SOFT_LINK(libGLESv2, glUniformMatrix4fv, void, GL_APIENTRY, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value), (location, count, transpose, value));
 SOFT_LINK(libGLESv2, glUseProgram, void, GL_APIENTRY, (GLuint program), (program));
 SOFT_LINK(libGLESv2, glValidateProgram, void, GL_APIENTRY, (GLuint program), (program));
-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));
 SOFT_LINK(libGLESv2, glVertexAttrib1f, void, GL_APIENTRY, (GLuint indx, GLfloat x), (indx, x));
 SOFT_LINK(libGLESv2, glVertexAttrib1fv, void, GL_APIENTRY, (GLuint indx, const GLfloat* values), (indx, values));
 SOFT_LINK(libGLESv2, glVertexAttrib2f, void, GL_APIENTRY, (GLuint indx, GLfloat x, GLfloat y), (indx, x, y));

Modified: trunk/Source/WebCore/ChangeLog (184604 => 184605)


--- 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)
@@ -1,3 +1,21 @@
+2015-05-19  Carlos Alberto Lopez Perez  <[email protected]>
+
+        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):
+
 2015-05-19  Roger Fong  <[email protected]>
 
         Upper half of volume control should be filled, not hollow.

Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (184604 => 184605)


--- 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)
@@ -1361,7 +1361,7 @@
 {
     makeContextCurrent();
     GLuint array = 0;
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     glGenVertexArrays(1, &array);
 #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     glGenVertexArraysAPPLE(1, &array);
@@ -1375,7 +1375,7 @@
         return;
     
     makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     glDeleteVertexArrays(1, &array);
 #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     glDeleteVertexArraysAPPLE(1, &array);
@@ -1388,7 +1388,7 @@
         return GL_FALSE;
     
     makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     return glIsVertexArray(array);
 #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     return glIsVertexArrayAPPLE(array);
@@ -1399,7 +1399,7 @@
 void GraphicsContext3D::bindVertexArray(Platform3DObject array)
 {
     makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
     glBindVertexArray(array);
 #elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     glBindVertexArrayAPPLE(array);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to