Bug 113034 - [GTK] Include the right GL header for GLES2
Summary: [GTK] Include the right GL header for GLES2
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Mario Sanchez Prada
URL:
Keywords: Gtk
Depends on:
Blocks:
 
Reported: 2013-03-22 02:52 PDT by Mario Sanchez Prada
Modified: 2013-03-22 11:50 PDT (History)
2 users (show)

See Also:

Attachments
Patch proposal (2.67 KB, patch)
2013-03-22 03:10 PDT, Mario Sanchez Prada 		mrobinson: review+
mrobinson: commit-queue-
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 Mario Sanchez Prada 2013-03-22 02:52:28 PDT 
It's currently an issue in the following two files:

Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

Patch will follow
Comment 1 Mario Sanchez Prada 2013-03-22 03:10:21 PDT 
Created attachment 194494 [details]
Patch proposal

Here comes the patch
Comment 2 Martin Robinson 2013-03-22 07:10:50 PDT 
Comment on attachment 194494 [details]
Patch proposal

Do you mind moving the conditional includes to separate block below from the main section? For instance:

#include "stuff.h"
#include <a.h>
#include <b.h>

#if USE(OPENGL_ES_2)
#include <c.h>
#else
#include <d.h>
#endif
Comment 3 Mario Sanchez Prada 2013-03-22 11:40:05 PDT 
(In reply to comment #2)
> (From update of attachment 194494 [details])
> Do you mind moving the conditional includes to separate block below from
> the main section? 

Not a problem at all, I'll do it.

Thanks
Comment 4 Mario Sanchez Prada 2013-03-22 11:50:03 PDT 
Committed r146637: <http://trac.webkit.org/changeset/146637>