[ANGLE] Declarations should match definitions
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 May 2020 16:38:58 +0000 (16:38 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 May 2020 16:38:58 +0000 (16:38 +0000)
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:

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

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm

index 819e3f8..25bfce2 100644 (file)
@@ -1,3 +1,21 @@
+2020-05-05  Jonathan Bedard  <jbedard@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  <changseok@webkit.org>
 
         [GTK] Fix build failures for ANGLE_WEBGL after r259589
index f4091f3..e152f0d 100644 (file)
@@ -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 @@ class DisplayEAGL : public DisplayGL
 
 }  // namespace rx
 
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
 #endif  // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
index 8580441..ceb2d11 100644 (file)
@@ -205,11 +205,7 @@ egl::ConfigSet DisplayEAGL::generateConfigs()
     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 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features)
 }
 }
 
-#endif  // defined(ANGLE_PLATFORM_IOS)
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
index 4c7fb07..11c4d42 100644 (file)
@@ -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 @@ class IOSurfaceSurfaceEAGL : public SurfaceGL
 
 }  // namespace rx
 
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
 #endif  // LIBANGLE_RENDERER_GL_EAGL_IOSURFACESURFACEEAGL_H_
index 3ca0e1c..3a73c0d 100644 (file)
@@ -417,4 +417,4 @@ IOSurfaceLockOptions IOSurfaceSurfaceEAGL::getIOSurfaceLockOptions() const
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS)
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
index cd477cc..3efeb67 100644 (file)
@@ -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 @@ class WindowSurfaceEAGL : public SurfaceGL
 
 }  // namespace rx
 
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
 #endif  // LIBANGLE_RENDERER_GL_EAGL_WINDOWSURFACEEAGL_H_
index 6cef7d3..676dc4a 100644 (file)
@@ -305,4 +305,4 @@ FramebufferImpl *WindowSurfaceEAGL::createDefaultFramebuffer(const gl::Context *
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS)
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)