Changeset 225051 in webkit

Timestamp:

Nov 20, 2017 7:57:57 AM (6 years ago)

Author:

clopez@igalia.com

Message:

[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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GLContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-20  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [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-20  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/platform/graphics/GLContext.h

@@ -25 +25 @@
 #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