Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (261184 => 261185)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-05 18:34:21 UTC (rev 261184)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-05 18:42:55 UTC (rev 261185)
@@ -1,3 +1,15 @@
+2020-05-05 Saam Barati <sbar...@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 <jbed...@apple.com>
[ANGLE] Declarations should match definitions
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h (261184 => 261185)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h 2020-05-05 18:34:21 UTC (rev 261184)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h 2020-05-05 18:42:55 UTC (rev 261185)
@@ -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 @@
} // 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 (261184 => 261185)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm 2020-05-05 18:34:21 UTC (rev 261184)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm 2020-05-05 18:42:55 UTC (rev 261185)
@@ -205,7 +205,11 @@
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 @@
}
}
-#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+#endif // defined(ANGLE_PLATFORM_IOS)
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h (261184 => 261185)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h 2020-05-05 18:34:21 UTC (rev 261184)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h 2020-05-05 18:42:55 UTC (rev 261185)
@@ -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 @@
} // 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 (261184 => 261185)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm 2020-05-05 18:34:21 UTC (rev 261184)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm 2020-05-05 18:42:55 UTC (rev 261185)
@@ -417,4 +417,4 @@
} // namespace rx
-#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+#endif // defined(ANGLE_PLATFORM_IOS)
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h (261184 => 261185)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h 2020-05-05 18:34:21 UTC (rev 261184)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h 2020-05-05 18:42:55 UTC (rev 261185)
@@ -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 @@
} // 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 (261184 => 261185)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm 2020-05-05 18:34:21 UTC (rev 261184)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm 2020-05-05 18:42:55 UTC (rev 261185)
@@ -305,4 +305,4 @@
} // namespace rx
-#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+#endif // defined(ANGLE_PLATFORM_IOS)
