Title: [226114] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 226114
- Author
- [email protected]
- Date
- 2017-12-19 00:15:33 -0800 (Tue, 19 Dec 2017)
Log Message
Merge r225051 - [WPE] GLContextEGLWPE.cpp:44:96: error: invalid cast from type ‘GLNativeWindowType {aka long long unsigned int}’ to type ‘EGLNativeWindowType {aka unsigned int}
https://bugs.webkit.org/show_bug.cgi?id=179511
Reviewed by Žan Doberšek.
r217208 changed the definition of GLNativeWindowType from EGLNativeWindowType to uint64_t for platform WPE.
This built fine on a 64-bit platform since uint64_t matches the size of a pointer, but fails on 32-bits.
This switches back the definition to EGLNativeWindowType.
And we need to include <EGL/eglplatform.h> first in order to get a definition for EGLNativeWindowType itself.
This commit pretty much reverts the changes r217208 did on platform/graphics/GLContext.h
No new tests, it is a build fix.
* platform/graphics/GLContext.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226113 => 226114)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-12-19 08:13:07 UTC (rev 226113)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-12-19 08:15:33 UTC (rev 226114)
@@ -1,3 +1,22 @@
+2017-11-20 Carlos Alberto Lopez Perez <[email protected]>
+
+ [WPE] GLContextEGLWPE.cpp:44:96: error: invalid cast from type ‘GLNativeWindowType {aka long long unsigned int}’ to type ‘EGLNativeWindowType {aka unsigned int}
+ https://bugs.webkit.org/show_bug.cgi?id=179511
+
+ Reviewed by Žan Doberšek.
+
+ r217208 changed the definition of GLNativeWindowType from EGLNativeWindowType to uint64_t for platform WPE.
+ This built fine on a 64-bit platform since uint64_t matches the size of a pointer, but fails on 32-bits.
+
+ This switches back the definition to EGLNativeWindowType.
+ And we need to include <EGL/eglplatform.h> first in order to get a definition for EGLNativeWindowType itself.
+
+ This commit pretty much reverts the changes r217208 did on platform/graphics/GLContext.h
+
+ No new tests, it is a build fix.
+
+ * platform/graphics/GLContext.h:
+
2017-11-11 Helmut Grohne <[email protected]>
[GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/GLContext.h (226113 => 226114)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/GLContext.h 2017-12-19 08:13:07 UTC (rev 226113)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/GLContext.h 2017-12-19 08:15:33 UTC (rev 226114)
@@ -24,10 +24,17 @@
#include "PlatformDisplay.h"
#include <wtf/Noncopyable.h>
-#if USE(EGL) && !PLATFORM(GTK) && !PLATFORM(WPE)
+#if USE(EGL) && !PLATFORM(GTK)
+#if PLATFORM(WPE)
+// FIXME: For now default to the GBM EGL platform, but this should really be
+// somehow deducible from the build configuration.
+#define __GBM__ 1
+#include <EGL/eglplatform.h>
+#else
#include "eglplatform.h"
+#endif // PLATFORM(WPE)
typedef EGLNativeWindowType GLNativeWindowType;
-#else
+#else // !USE(EGL) || PLATFORM(GTK)
typedef uint64_t GLNativeWindowType;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
