Inconsistent EGL defines in ImageBufferCairo
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Apr 2018 06:54:26 +0000 (06:54 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Apr 2018 06:54:26 +0000 (06:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184661

Patch by Pablo Saavedra <psaavedra@igalia.com> on 2018-04-16
Reviewed by Žan Doberšek.

On revision r219391 libepoxy is added. The headers in
ImageBufferCairo.cpp become inconsistent when 2D canvas is enabled
(-DENABLE_ACCELERATED_2D_CANVAS=ON) due to a redefinition error during
the Webkit build:

    ...
    /usr/include/GLES2/gl2.h:503:82: error: 'voi
    epoxy_glAttachShader(GLuint, GLuint)' redeclared as different kind
    of symbol
    GL_APICALL void         GL_APIENTRY glAttachShader (GLuint
    program, GLuint shader);

No new tests.

* platform/graphics/cairo/ImageBufferCairo.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230702 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

index 51095db..c32b0d4 100644 (file)
@@ -1,3 +1,26 @@
+2018-04-16  Pablo Saavedra  <psaavedra@igalia.com>
+
+        Inconsistent EGL defines in ImageBufferCairo
+        https://bugs.webkit.org/show_bug.cgi?id=184661
+
+        Reviewed by Žan Doberšek.
+
+        On revision r219391 libepoxy is added. The headers in
+        ImageBufferCairo.cpp become inconsistent when 2D canvas is enabled
+        (-DENABLE_ACCELERATED_2D_CANVAS=ON) due to a redefinition error during
+        the Webkit build:
+
+            ...
+            /usr/include/GLES2/gl2.h:503:82: error: 'voi
+            epoxy_glAttachShader(GLuint, GLuint)' redeclared as different kind
+            of symbol
+            GL_APICALL void         GL_APIENTRY glAttachShader (GLuint
+            program, GLuint shader);
+
+        No new tests.
+
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+
 2018-04-16  Filip Pizlo  <fpizlo@apple.com>
 
         MutationObserver should be in an IsoHeap
index f50b4be..d35eadc 100644 (file)
 #include "GLContext.h"
 #include "TextureMapperGL.h"
 
-#if USE(EGL) && USE(LIBEPOXY)
+#if USE(EGL)
+#if USE(LIBEPOXY)
 #include "EpoxyEGL.h"
+#else
+#include <EGL/egl.h>
+#endif
 #endif
 #include <cairo-gl.h>
 
-#if USE(OPENGL_ES)
+#if USE(LIBEPOXY)
+#include <epoxy/gl.h>
+#elif USE(OPENGL_ES)
 #include <GLES2/gl2.h>
 #else
 #include "OpenGLShims.h"