Unreviewed, reverting r261176.
authorsbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 May 2020 18:42:55 +0000 (18:42 +0000)
committersbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 May 2020 18:42:55 +0000 (18:42 +0000)
It broke the build

Reverted changeset:

"[ANGLE] Declarations should match definitions"
https://bugs.webkit.org/show_bug.cgi?id=211410
https://trac.webkit.org/changeset/261176

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261185 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 25bfce2..2b0c963 100644 (file)
@@ -1,3 +1,15 @@
+2020-05-05  Saam Barati  <sbarati@apple.com>
+
+        Unreviewed, reverting r261176.
+
+        It broke the build
+
+        Reverted changeset:
+
+        "[ANGLE] Declarations should match definitions"
+        https://bugs.webkit.org/show_bug.cgi?id=211410
+        https://trac.webkit.org/changeset/261176
+
 2020-05-05  Jonathan Bedard  <jbedard@apple.com>
 
         [ANGLE] Declarations should match definitions
index e152f0d..f4091f3 100644 (file)
@@ -9,10 +9,6 @@
 #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__
@@ -97,6 +93,4 @@ class DisplayEAGL : public DisplayGL
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
-
 #endif  // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
index ceb2d11..8580441 100644 (file)
@@ -205,7 +205,11 @@ 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;
 
@@ -374,4 +378,4 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features)
 }
 }
 
-#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+#endif  // defined(ANGLE_PLATFORM_IOS)
index 11c4d42..4c7fb07 100644 (file)
@@ -7,10 +7,6 @@
 #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"
 
@@ -90,6 +86,4 @@ class IOSurfaceSurfaceEAGL : public SurfaceGL
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
-
 #endif  // LIBANGLE_RENDERER_GL_EAGL_IOSURFACESURFACEEAGL_H_
index 3a73c0d..3ca0e1c 100644 (file)
@@ -417,4 +417,4 @@ IOSurfaceLockOptions IOSurfaceSurfaceEAGL::getIOSurfaceLockOptions() const
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+#endif  // defined(ANGLE_PLATFORM_IOS)
index 3efeb67..cd477cc 100644 (file)
@@ -9,10 +9,6 @@
 #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__
@@ -109,6 +105,4 @@ class WindowSurfaceEAGL : public SurfaceGL
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
-
 #endif  // LIBANGLE_RENDERER_GL_EAGL_WINDOWSURFACEEAGL_H_
index 676dc4a..6cef7d3 100644 (file)
@@ -305,4 +305,4 @@ FramebufferImpl *WindowSurfaceEAGL::createDefaultFramebuffer(const gl::Context *
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+#endif  // defined(ANGLE_PLATFORM_IOS)