Bug 165283 - Fix WinCairo build after r208997
Summary: Fix WinCairo build after r208997
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Alex Christensen
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-01 15:19 PST by Alex Christensen
Modified: 2018-02-21 12:01 PST (History)
7 users (show)

See Also:

Attachments
Patch (1.13 KB, patch)
2016-12-01 15:22 PST, Alex Christensen 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Christensen 2016-12-01 15:19:36 PST 
Fix WinCairo build after r208997
Comment 1 Alex Christensen 2016-12-01 15:22:42 PST 
Created attachment 295905 [details]
Patch
Comment 2 Carlos Garcia Campos 2016-12-01 23:57:36 PST 
Comment on attachment 295905 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=295905&action=review

Thanks!

> Source/WebCore/platform/graphics/GLContext.cpp:32
> +#if USE(OPENGL_ES_2)
> +#include <GLES2/gl2.h>
> +#include <GLES3/gl3.h>
> +#endif

Is this still needed after bug #165253? Plan is to switch to glGetString(GL_VERSION). In any case, let's fix the build now, and we will remove this includes if they are not needed as part of #165253.
Comment 3 Alex Christensen 2016-12-01 23:59:17 PST 
Comment on attachment 295905 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=295905&action=review

>> Source/WebCore/platform/graphics/GLContext.cpp:32
>> +#endif
> 
> Is this still needed after bug #165253? Plan is to switch to glGetString(GL_VERSION). In any case, let's fix the build now, and we will remove this includes if they are not needed as part of #165253.

I think the include gl2 will be needed still.
Comment 4 WebKit Commit Bot 2016-12-02 00:24:30 PST 
Comment on attachment 295905 [details]
Patch

Clearing flags on attachment: 295905

Committed r209233: <http://trac.webkit.org/changeset/209233>
Comment 5 WebKit Commit Bot 2016-12-02 00:24:34 PST 
All reviewed patches have been landed.  Closing bug.
Comment 6 Michael Catanzaro 2016-12-22 17:38:35 PST 
But:

#if USE(OPENGL_ES_2) 
	#include <GLES2/gl2.h> 
	#include <GLES3/gl3.h> 
#endif

You are using a GLES3 header inside a GLES2 guard. I think we need to find a different guard to use instead.
Comment 7 Michael Catanzaro 2018-02-21 12:01:19 PST 
(In reply to Michael Catanzaro from comment #6)
> But:
> 
> #if USE(OPENGL_ES_2) 
> 	#include <GLES2/gl2.h> 
> 	#include <GLES3/gl3.h> 
> #endif
> 
> You are using a GLES3 header inside a GLES2 guard. I think we need to find a
> different guard to use instead.

See bug #183008.