Title: [209856] trunk/Source
- Revision
- 209856
- Author
- [email protected]
- Date
- 2016-12-15 00:17:17 -0800 (Thu, 15 Dec 2016)
Log Message
Fix Windows WebGL build after r209832
* CMakeLists.txt:
Source/ThirdParty/ANGLE:
* include/EGL/egl.h:
* include/GLES2/gl2.h:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (209855 => 209856)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-12-15 05:15:11 UTC (rev 209855)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-12-15 08:17:17 UTC (rev 209856)
@@ -258,6 +258,7 @@
file(GLOB _files_ANGLE "${THIRDPARTY_DIR}/ANGLE/ANGLE/*.h")
file(GLOB _files_egl "${THIRDPARTY_DIR}/ANGLE/include/egl/*.h")
file(GLOB _files_GLES2 "${THIRDPARTY_DIR}/ANGLE/include/GLES2/*.h")
+file(GLOB _files_GLES3 "${THIRDPARTY_DIR}/ANGLE/include/GLES3/*.h")
file(GLOB _files_GLSLANG "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG/*.h")
file(GLOB _files_khr "${THIRDPARTY_DIR}/ANGLE/include/khr/*.h")
foreach (_file ${_files_ANGLE})
@@ -269,6 +270,9 @@
foreach (_file ${_files_GLES2})
file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
endforeach ()
+foreach (_file ${_files_GLES3})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES3)
+endforeach ()
foreach (_file ${_files_GLSLANG})
file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
endforeach ()
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (209855 => 209856)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-12-15 05:15:11 UTC (rev 209855)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-12-15 08:17:17 UTC (rev 209856)
@@ -1,3 +1,11 @@
+2016-12-15 Alex Christensen <[email protected]>
+
+ Fix Windows WebGL build after r209832
+
+ * CMakeLists.txt:
+ * include/EGL/egl.h:
+ * include/GLES2/gl2.h:
+
2016-12-14 Alex Christensen <[email protected]>
Progress towards using ANGLE to do WebGL rendering
Modified: trunk/Source/ThirdParty/ANGLE/include/EGL/egl.h (209855 => 209856)
--- trunk/Source/ThirdParty/ANGLE/include/EGL/egl.h 2016-12-15 05:15:11 UTC (rev 209855)
+++ trunk/Source/ThirdParty/ANGLE/include/EGL/egl.h 2016-12-15 08:17:17 UTC (rev 209856)
@@ -313,7 +313,7 @@
#endif /* EGL_VERSION_1_5 */
#if EGL_SOFT_LINKING
-#include <ANGLE/eglsoftlinking.h>
+#include <EGL/eglsoftlinking.h>
#endif
#ifdef __cplusplus
Modified: trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2.h (209855 => 209856)
--- trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2.h 2016-12-15 05:15:11 UTC (rev 209855)
+++ trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2.h 2016-12-15 08:17:17 UTC (rev 209856)
@@ -522,7 +522,7 @@
typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
#if defined(_MSC_VER) && !defined(ANGLE_WEBKIT_WIN)
-#include <ANGLE/gl2softlinking.h>
+#include <GLES2/gl2softlinking.h>
#else
#ifdef GL_GLEXT_PROTOTYPES
Modified: trunk/Source/WebCore/CMakeLists.txt (209855 => 209856)
--- trunk/Source/WebCore/CMakeLists.txt 2016-12-15 05:15:11 UTC (rev 209855)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-15 08:17:17 UTC (rev 209856)
@@ -788,8 +788,10 @@
if (WIN32 AND INTERNAL_BUILD)
set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core/Scripts")
+ set(ANGLE_FORWARDING_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/ANGLE")
else ()
set(_javascript_Core_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/Scripts")
+ set(ANGLE_FORWARDING_HEADERS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE")
endif ()
set(WebCore_SOURCES
@@ -3269,6 +3271,7 @@
endif ()
list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${ANGLE_FORWARDING_HEADERS_DIR}"
"${WEBCORE_DIR}/platform/graphics/gpu"
)
Modified: trunk/Source/WebCore/ChangeLog (209855 => 209856)
--- trunk/Source/WebCore/ChangeLog 2016-12-15 05:15:11 UTC (rev 209855)
+++ trunk/Source/WebCore/ChangeLog 2016-12-15 08:17:17 UTC (rev 209856)
@@ -1,3 +1,9 @@
+2016-12-15 Alex Christensen <[email protected]>
+
+ Fix Windows WebGL build after r209832
+
+ * CMakeLists.txt:
+
2016-12-14 Hunseop Jeong <[email protected]>
Unreviewed build fix after r209832
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
