[ANGLE] Correct Catalyst guards
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Jun 2020 21:03:35 +0000 (21:03 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Jun 2020 21:03:35 +0000 (21:03 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263284 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm

index 905bea0..a40ffed 100644 (file)
@@ -1,3 +1,16 @@
+2020-06-19  Jonathan Bedard  <jbedard@apple.com>
+
+        [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  <dino@apple.com>
 
         Add a dynamic library target for ANGLE
index 9155657..a983461 100644 (file)
@@ -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 @@ void DeviceEAGL::generateExtensions(egl::DeviceExtensions *outExtensions) const
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS)
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
index 1b4a2db..5769692 100644 (file)
@@ -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 @@ class DeviceEAGL : public DeviceImpl
 
 }  // namespace rx
 
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
 #endif  // LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
index f4091f3..261ba40 100644 (file)
@@ -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 @@ class DisplayEAGL : public DisplayGL
 
 }  // namespace rx
 
+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
 #endif  // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
index 8580441..babc2c4 100644 (file)
@@ -378,4 +378,4 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features)
 }
 }
 
-#endif  // defined(ANGLE_PLATFORM_IOS)
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)