Bug 184661 - Inconsistent EGL defines in ImageBufferCairo
Summary: Inconsistent EGL defines in ImageBufferCairo
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Trivial
Assignee: Nobody
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2018-04-16 13:16 PDT by Pablo Saavedra
Modified: 2018-04-16 23:55 PDT (History)
5 users (show)

See Also:


Attachments
Patch (2.48 KB, patch)
2018-04-16 13:28 PDT, Pablo Saavedra
no flags Details | Formatted Diff | Diff
patch (1.94 KB, patch)
2018-04-16 13:35 PDT, Pablo Saavedra
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Pablo Saavedra 2018-04-16 13:16:15 PDT
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: 'void epoxy_glAttachShader(GLuint, GLuint)' redeclared as different kind of symbol
   GL_APICALL void         GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
  ...


Related to https://bugs.webkit.org/show_bug.cgi?id=172104
Comment 1 Pablo Saavedra 2018-04-16 13:28:11 PDT
Created attachment 338031 [details]
Patch
Comment 2 Pablo Saavedra 2018-04-16 13:35:29 PDT
Created attachment 338032 [details]
patch
Comment 3 WebKit Commit Bot 2018-04-16 23:54:32 PDT
Comment on attachment 338032 [details]
patch

Clearing flags on attachment: 338032

Committed r230702: <https://trac.webkit.org/changeset/230702>
Comment 4 WebKit Commit Bot 2018-04-16 23:54:33 PDT
All reviewed patches have been landed.  Closing bug.
Comment 5 Radar WebKit Bug Importer 2018-04-16 23:55:16 PDT
<rdar://problem/39482971>