Title: [181629] trunk/Source
- Revision
- 181629
- Author
- [email protected]
- Date
- 2015-03-17 02:45:55 -0700 (Tue, 17 Mar 2015)
Log Message
[CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
https://bugs.webkit.org/show_bug.cgi?id=142530
Reviewed by Darin Adler.
Source/ThirdParty/ANGLE:
* ANGLE/ShaderLang.h: Added. Includes include/GLSLANG/ShaderLang.h. Used in WebCore
so we can avoid using ANGLE's EGL headers and use the system-default headers instead.
Source/WebCore:
Include the ANGLE's ShaderLang.h through the new forwarding header. This allows
us to not list Source/ThirdParty/ANGLE/include in the list of inclusion directories
and thus avoid ANGLE's EGL and GLES2/GLES3 headers, defaulting to the system-provided
headers instead.
Source/ThirdParty/ANGLE/include/KHR is still used because ANGLE's khrplatform.h is
required by the ShaderLang.h header. Source/ThirdParty/ANGLE/src is not used for the
whole WebCore library anymore, only the ANGLESupport library.
* CMakeLists.txt:
* platform/graphics/ANGLEWebKitBridge.h:
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
Source/WebKit2:
* CMakeLists.txt: Replace the Source/ThirdParty/ANGLE/include/GLSLANG entry
in the list of inclusion directories for WebKit2 with Source/ThirdParty/ANGLE,
possible due to the new forwarding header for ANGLE's ShaderLang.h.
Modified Paths
Added Paths
Diff
Added: trunk/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h (0 => 181629)
--- trunk/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h 2015-03-17 09:45:55 UTC (rev 181629)
@@ -0,0 +1 @@
+#include "include/GLSLANG/ShaderLang.h"
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (181628 => 181629)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-03-17 09:45:55 UTC (rev 181629)
@@ -1,3 +1,13 @@
+2015-03-17 Zan Dobersek <[email protected]>
+
+ [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
+ https://bugs.webkit.org/show_bug.cgi?id=142530
+
+ Reviewed by Darin Adler.
+
+ * ANGLE/ShaderLang.h: Added. Includes include/GLSLANG/ShaderLang.h. Used in WebCore
+ so we can avoid using ANGLE's EGL headers and use the system-default headers instead.
+
2015-03-16 Roger Fong <[email protected]>
[Win] Unreviewed build fix after r181571.
Modified: trunk/Source/WebCore/CMakeLists.txt (181628 => 181629)
--- trunk/Source/WebCore/CMakeLists.txt 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-03-17 09:45:55 UTC (rev 181629)
@@ -2991,10 +2991,8 @@
endif ()
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${THIRDPARTY_DIR}/ANGLE/src"
- "${THIRDPARTY_DIR}/ANGLE/include/"
+ "${THIRDPARTY_DIR}/ANGLE/"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
- "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
"${WEBCORE_DIR}/platform/graphics/gpu"
)
@@ -3522,6 +3520,7 @@
APPEND
PROPERTY INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/ANGLE/include"
+ "${THIRDPARTY_DIR}/ANGLE/src"
)
list(APPEND WebCore_LIBRARIES ANGLESupport)
WEBKIT_SET_EXTRA_COMPILER_FLAGS(ANGLESupport IGNORECXX_WARNINGS)
Modified: trunk/Source/WebCore/ChangeLog (181628 => 181629)
--- trunk/Source/WebCore/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 09:45:55 UTC (rev 181629)
@@ -1,3 +1,23 @@
+2015-03-17 Zan Dobersek <[email protected]>
+
+ [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
+ https://bugs.webkit.org/show_bug.cgi?id=142530
+
+ Reviewed by Darin Adler.
+
+ Include the ANGLE's ShaderLang.h through the new forwarding header. This allows
+ us to not list Source/ThirdParty/ANGLE/include in the list of inclusion directories
+ and thus avoid ANGLE's EGL and GLES2/GLES3 headers, defaulting to the system-provided
+ headers instead.
+
+ Source/ThirdParty/ANGLE/include/KHR is still used because ANGLE's khrplatform.h is
+ required by the ShaderLang.h header. Source/ThirdParty/ANGLE/src is not used for the
+ whole WebCore library anymore, only the ANGLESupport library.
+
+ * CMakeLists.txt:
+ * platform/graphics/ANGLEWebKitBridge.h:
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+
2015-03-17 Matt Baker <[email protected]>
Web Inspector: Show rendering frames (and FPS) in Layout and Rendering timeline
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (181628 => 181629)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2015-03-17 09:45:55 UTC (rev 181629)
@@ -34,7 +34,7 @@
#elif PLATFORM(WIN)
#include "GLSLANG/ShaderLang.h"
#else
-#include "ShaderLang.h"
+#include <ANGLE/ShaderLang.h>
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (181628 => 181629)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2015-03-17 09:45:55 UTC (rev 181629)
@@ -39,7 +39,7 @@
#include "NotImplemented.h"
#include "PlatformContextCairo.h"
#include "RefPtrCairo.h"
-#include <GLSLANG/ShaderLang.h>
+#include <ANGLE/ShaderLang.h>
#include <cairo.h>
#if USE(OPENGL_ES_2)
Modified: trunk/Source/WebKit2/CMakeLists.txt (181628 => 181629)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-03-17 09:45:55 UTC (rev 181629)
@@ -149,8 +149,8 @@
if (WTF_USE_3D_GRAPHICS)
list(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${THIRDPARTY_DIR}/ANGLE"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
- "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
)
endif ()
Modified: trunk/Source/WebKit2/ChangeLog (181628 => 181629)
--- trunk/Source/WebKit2/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-17 09:45:55 UTC (rev 181629)
@@ -1,3 +1,14 @@
+2015-03-17 Zan Dobersek <[email protected]>
+
+ [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
+ https://bugs.webkit.org/show_bug.cgi?id=142530
+
+ Reviewed by Darin Adler.
+
+ * CMakeLists.txt: Replace the Source/ThirdParty/ANGLE/include/GLSLANG entry
+ in the list of inclusion directories for WebKit2 with Source/ThirdParty/ANGLE,
+ possible due to the new forwarding header for ANGLE's ShaderLang.h.
+
2015-03-17 Gwang Yoon Hwang <[email protected]>
REGRESSION(r180924): Unable to build WebKitGTK+ with threaded compositor
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
