Title: [263284] trunk/Source/ThirdParty/ANGLE
- Revision
- 263284
- Author
- [email protected]
- Date
- 2020-06-19 14:03:35 -0700 (Fri, 19 Jun 2020)
Log Message
[ANGLE] Correct Catalyst guards
https://bugs.webkit.org/show_bug.cgi?id=211410
<rdar://problem/62891185>
Reviewed by Dean Jackson.
* src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp: Do not compile on Mac.
* src/libANGLE/renderer/gl/eagl/DeviceEAGL.h: Definitions should not be available on Mac.
* src/libANGLE/renderer/gl/eagl/DisplayEAGL.h: Definitions should not be available on Mac.
* src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm: Do not compile on Mac.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (263283 => 263284)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-06-19 21:00:21 UTC (rev 263283)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-06-19 21:03:35 UTC (rev 263284)
@@ -1,3 +1,16 @@
+2020-06-19 Jonathan Bedard <[email protected]>
+
+ [ANGLE] Correct Catalyst guards
+ https://bugs.webkit.org/show_bug.cgi?id=211410
+ <rdar://problem/62891185>
+
+ Reviewed by Dean Jackson.
+
+ * src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp: Do not compile on Mac.
+ * src/libANGLE/renderer/gl/eagl/DeviceEAGL.h: Definitions should not be available on Mac.
+ * src/libANGLE/renderer/gl/eagl/DisplayEAGL.h: Definitions should not be available on Mac.
+ * src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm: Do not compile on Mac.
+
2020-06-10 Dean Jackson <[email protected]>
Add a dynamic library target for ANGLE
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp (263283 => 263284)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp 2020-06-19 21:00:21 UTC (rev 263283)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp 2020-06-19 21:03:35 UTC (rev 263284)
@@ -8,7 +8,7 @@
#import "common/platform.h"
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
# include "libANGLE/renderer/gl/eagl/DeviceEAGL.h"
@@ -56,4 +56,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/DeviceEAGL.h (263283 => 263284)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h 2020-06-19 21:00:21 UTC (rev 263283)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h 2020-06-19 21:03:35 UTC (rev 263284)
@@ -9,6 +9,10 @@
#ifndef LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
#define LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
+#import "common/platform.h"
+
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#include "libANGLE/Device.h"
#include "libANGLE/renderer/DeviceImpl.h"
@@ -30,4 +34,6 @@
} // namespace rx
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
#endif // LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h (263283 => 263284)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h 2020-06-19 21:00:21 UTC (rev 263283)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h 2020-06-19 21:03:35 UTC (rev 263284)
@@ -9,6 +9,10 @@
#ifndef LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
#define LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
+#import "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 (263283 => 263284)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm 2020-06-19 21:00:21 UTC (rev 263283)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm 2020-06-19 21:03:35 UTC (rev 263284)
@@ -378,4 +378,4 @@
}
}
-#endif // defined(ANGLE_PLATFORM_IOS)
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
