| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 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 | |