diff options
author | Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com> | 2018-02-27 16:17:59 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 11:35:41 +0000 |
commit | 8b8445461a72d0d3bafb33470c116cbd4a8c35c8 (patch) | |
tree | da9b174820c671c1b4cbf2eb2faafb668bc80752 /meta/recipes-sato/webkit/webkitgtk | |
parent | bc326572ee322f2fe1847ebffce6d3e8e1c8f923 (diff) | |
download | poky-8b8445461a72d0d3bafb33470c116cbd4a8c35c8.tar.gz |
webkitgtk_2.16.6.bb: Remove gl3.h header reference
GLES 2 application cannot use gl3.h header files, remove including gl3.h
when OpenGLESv2 is enabled in webkitgtk
(From OE-Core rev: 23d6bd1a3b97db624eac4ad6650a1e4298ade7a2)
Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch new file mode 100644 index 0000000000..21574072f1 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bhargava Sreekantappa Gayathri | ||
3 | <bhargava.sreekantappa-gayathri@xilinx.com> | ||
4 | Date: Tue, 27 Feb 2018 16:09:31 -0800 | ||
5 | Subject: [PATCH] Fix gles3 header when gles2 is enabled | ||
6 | |||
7 | A GLES 2 application should not use gl3.h. | ||
8 | Fix the gles3 header failure while compiling webkitgtk. | ||
9 | |||
10 | FAILED: | ||
11 | Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o | ||
12 | ^~~~~~~~~~~~~ | ||
13 | compilation terminated. | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008 | ||
17 | |||
18 | Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com> | ||
19 | Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | ||
20 | --- | ||
21 | Source/WebCore/platform/graphics/GLContext.cpp | 1 - | ||
22 | 1 file changed, 1 deletion(-) | ||
23 | |||
24 | diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp | ||
25 | index 599dcc0..46d2fd4 100644 | ||
26 | --- a/Source/WebCore/platform/graphics/GLContext.cpp | ||
27 | +++ b/Source/WebCore/platform/graphics/GLContext.cpp | ||
28 | @@ -31,7 +31,6 @@ | ||
29 | #elif USE(OPENGL_ES_2) | ||
30 | #define GL_GLEXT_PROTOTYPES 1 | ||
31 | #include <GLES2/gl2.h> | ||
32 | -#include <GLES3/gl3.h> | ||
33 | #endif | ||
34 | |||
35 | #if USE(GLX) | ||
36 | -- | ||
37 | 2.7.4 | ||
38 | |||