Title: [261176] trunk/Source/ThirdParty/ANGLE
- Revision
- 261176
- Author
- jbed...@apple.com
- Date
- 2020-05-05 09:38:58 -0700 (Tue, 05 May 2020)
Log Message
[ANGLE] Declarations should match definitions
https://bugs.webkit.org/show_bug.cgi?id=211410
Reviewed by Alex Christensen.
* src/libANGLE/renderer/gl/eagl/DisplayEAGL.h: Skip definitions for platforms
where class is undefined.
* src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm:
(rx::DisplayEAGL::generateConfigs): Function is not defined for for MacCatalyst.
* src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h: Skip definitions for platforms
where class is undefined.
* src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm:
* src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h: Skip definitions for platforms
where class is undefined.
* src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (261175 => 261176)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-05 16:28:49 UTC (rev 261175)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-05 16:38:58 UTC (rev 261176)
@@ -1,3 +1,21 @@
+2020-05-05 Jonathan Bedard <jbed...@apple.com>
+
+ [ANGLE] Declarations should match definitions
+ https://bugs.webkit.org/show_bug.cgi?id=211410
+
+ Reviewed by Alex Christensen.
+
+ * src/libANGLE/renderer/gl/eagl/DisplayEAGL.h: Skip definitions for platforms
+ where class is undefined.
+ * src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm:
+ (rx::DisplayEAGL::generateConfigs): Function is not defined for for MacCatalyst.
+ * src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h: Skip definitions for platforms
+ where class is undefined.
+ * src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm:
+ * src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h: Skip definitions for platforms
+ where class is undefined.
+ * src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm:
+
2020-04-28 ChangSeok Oh <changs...@webkit.org>
[GTK] Fix build failures for ANGLE_WEBGL after r259589
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h (261175 => 261176)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h 2020-05-05 16:28:49 UTC (rev 261175)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h 2020-05-05 16:38:58 UTC (rev 261176)
@@ -9,6 +9,10 @@
#ifndef LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
#define LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
+#include "common/platform.h"
+
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#include "libANGLE/renderer/gl/DisplayGL.h"
#ifdef __OBJC__
@@ -93,4 +97,6 @@
} // namespace rx
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#endif // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm (261175 => 261176)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm 2020-05-05 16:28:49 UTC (rev 261175)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm 2020-05-05 16:38:58 UTC (rev 261176)
@@ -205,11 +205,7 @@
config.bindToTextureRGB = EGL_FALSE;
config.bindToTextureRGBA = EGL_FALSE;
-# if !ANGLE_PLATFORM_MACCATALYST
config.bindToTextureTarget = EGL_TEXTURE_2D;
-# else
- config.bindToTextureTarget = EGL_TEXTURE_RECTANGLE_ANGLE;
-# endif
config.surfaceType = EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
@@ -378,4 +374,4 @@
}
}
-#endif // defined(ANGLE_PLATFORM_IOS)
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h (261175 => 261176)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h 2020-05-05 16:28:49 UTC (rev 261175)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h 2020-05-05 16:38:58 UTC (rev 261176)
@@ -7,6 +7,10 @@
#ifndef LIBANGLE_RENDERER_GL_EAGL_IOSURFACESURFACEEAGL_H_
#define LIBANGLE_RENDERER_GL_EAGL_IOSURFACESURFACEEAGL_H_
+#include "common/platform.h"
+
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#include "libANGLE/renderer/gl/SurfaceGL.h"
#include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
@@ -86,4 +90,6 @@
} // namespace rx
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#endif // LIBANGLE_RENDERER_GL_EAGL_IOSURFACESURFACEEAGL_H_
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm (261175 => 261176)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm 2020-05-05 16:28:49 UTC (rev 261175)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm 2020-05-05 16:38:58 UTC (rev 261176)
@@ -417,4 +417,4 @@
} // namespace rx
-#endif // defined(ANGLE_PLATFORM_IOS)
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h (261175 => 261176)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h 2020-05-05 16:28:49 UTC (rev 261175)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h 2020-05-05 16:38:58 UTC (rev 261176)
@@ -9,6 +9,10 @@
#ifndef LIBANGLE_RENDERER_GL_EAGL_WINDOWSURFACEEAGL_H_
#define LIBANGLE_RENDERER_GL_EAGL_WINDOWSURFACEEAGL_H_
+#import "common/platform.h"
+
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#include "libANGLE/renderer/gl/SurfaceGL.h"
#ifdef __OBJC__
@@ -105,4 +109,6 @@
} // namespace rx
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#endif // LIBANGLE_RENDERER_GL_EAGL_WINDOWSURFACEEAGL_H_
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm (261175 => 261176)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm 2020-05-05 16:28:49 UTC (rev 261175)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm 2020-05-05 16:38:58 UTC (rev 261176)
@@ -305,4 +305,4 @@
} // namespace rx
-#endif // defined(ANGLE_PLATFORM_IOS)
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
