[webkit-changes] [252250] trunk/Source/ThirdParty/ANGLE/src

Fri, 08 Nov 2019 11:57:23 -0800

Title: [252250] trunk/Source/ThirdParty/ANGLE/src
Revision
252250
Author
d...@apple.com
Date
2019-11-08 11:55:56 -0800 (Fri, 08 Nov 2019)

Log Message

Add ANGLE backend for iOS device
https://bugs.webkit.org/show_bug.cgi?id=202159
<rdar://57000166>

Build fixes for Mac Catalyst, tvOS and watchOS.

* src/common/PackedEnums.cpp:
(egl_gl::EGLTextureTargetToTextureType):
* src/common/platform.h:
* src/gpu_info_util/SystemInfo_ios.cpp:
* src/gpu_info_util/SystemInfo_macos.cpp:
* src/libANGLE/Display.cpp:
* src/libANGLE/formatutils.cpp:
(gl::BuildInternalFormatInfoMap):
* src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp:
* src/libANGLE/renderer/gl/cgl/DisplayCGL.mm:
* src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp:
* src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp:
* src/libANGLE/renderer/gl/cgl/RendererCGL.cpp:
* src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm:
* src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm:
* src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm:
* src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp:
* src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp:
* src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm:
* src/libANGLE/renderer/gl/renderergl_utils.cpp:
(rx::nativegl_gl::GenerateCaps):
* src/libANGLE/validationES2.cpp:
(gl::ValidateFramebufferTexture2D):

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/src/common/PackedEnums.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/common/PackedEnums.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/common/PackedEnums.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -374,7 +374,7 @@
             return gl::TextureType::_2D;
 
         case EGL_TEXTURE_RECTANGLE_ANGLE:
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
             return gl::TextureType::_2D;
 #else
             return gl::TextureType::Rectangle;

Modified: trunk/Source/ThirdParty/ANGLE/src/common/platform.h (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/common/platform.h	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/common/platform.h	2019-11-08 19:55:56 UTC (rev 252250)
@@ -115,12 +115,15 @@
 #    include <TargetConditionals.h>
 #    if TARGET_OS_OSX
 #        define ANGLE_PLATFORM_MACOS 1
-#    elif TARGET_OS_IOS
+#    elif TARGET_OS_IPHONE
 #        define ANGLE_PLATFORM_IOS 1
 #        define GLES_SILENCE_DEPRECATION
 #        if TARGET_OS_SIMULATOR
 #            define ANGLE_PLATFORM_IOS_SIMULATOR 1
 #        endif
+#        if TARGET_OS_MACCATALYST
+#            define ANGLE_PLATFORM_MACCATALYST
+#        endif
 #    endif
 #endif

Modified: trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -27,7 +27,7 @@
 
 #include "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "gpu_info_util/SystemInfo_internal.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -8,7 +8,7 @@
 
 #include "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "gpu_info_util/SystemInfo_internal.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -52,7 +52,7 @@
 #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
 #    elif defined(ANGLE_USE_X11)
 #        include "libANGLE/renderer/gl/glx/DisplayGLX.h"
-#    elif defined(ANGLE_PLATFORM_MACOS)
+#    elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 #        include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
 #    elif defined(ANGLE_PLATFORM_IOS)
 #        include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
@@ -234,7 +234,7 @@
             impl = new rx::DisplayWGL(state);
 #    elif defined(ANGLE_USE_X11)
             impl = new rx::DisplayGLX(state);
-#    elif defined(ANGLE_PLATFORM_MACOS)
+#    elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
             impl = new rx::DisplayCGL(state);
 #    elif defined(ANGLE_PLATFORM_IOS)
             impl = new rx::DisplayEAGL(state);

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -975,7 +975,7 @@
     AddRGBAFormat(&map, GL_RGBA,           false,  8,  8,  8,  8, 0, GL_RGBA,           GL_BYTE,                        GL_SIGNED_NORMALIZED,   false, NeverSupported,                                   NeverSupported,  NeverSupported,                                 NeverSupported);
     AddRGBAFormat(&map, GL_SRGB,           false,  8,  8,  8,  0, 0, GL_SRGB,           GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, true,  RequireExt<&Extensions::sRGB>,                    AlwaysSupported, NeverSupported,                                 NeverSupported);
     AddRGBAFormat(&map, GL_SRGB_ALPHA_EXT, false,  8,  8,  8,  8, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, true,  RequireExt<&Extensions::sRGB>,                    AlwaysSupported, RequireExt<&Extensions::sRGB>,                  NeverSupported);
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
     AddRGBAFormat(&map, GL_BGRA_EXT,       false,  8,  8,  8,  8, 0, GL_BGRA_EXT,       GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,   AlwaysSupported, RequireES<2, 0>, NeverSupported);
 #else
     AddRGBAFormat(&map, GL_BGRA_EXT,       false,  8,  8,  8,  8, 0, GL_BGRA_EXT,       GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>,   AlwaysSupported, RequireExt<&Extensions::textureFormatBGRA8888>, NeverSupported);

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -8,7 +8,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "libANGLE/renderer/gl/cgl/DeviceCGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm	2019-11-08 19:55:56 UTC (rev 252250)
@@ -8,7 +8,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
 #import "libANGLE/renderer/gl/cgl/DisplayCGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -9,7 +9,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -9,7 +9,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -8,7 +8,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
 #include "libANGLE/renderer/gl/cgl/RendererCGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm	2019-11-08 19:55:56 UTC (rev 252250)
@@ -8,7 +8,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
 #import "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm	2019-11-08 19:55:56 UTC (rev 252250)
@@ -27,7 +27,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
 
 #import "libANGLE/renderer/gl/eagl/DisplayEAGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm	2019-11-08 19:55:56 UTC (rev 252250)
@@ -25,7 +25,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
 
 #import "libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -28,7 +28,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -27,7 +27,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
 
 #include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
 #include "libANGLE/renderer/gl/eagl/RendererEAGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm	2019-11-08 19:55:56 UTC (rev 252250)
@@ -27,7 +27,7 @@
 
 #import "common/platform.h"
 
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
 
 #import "libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h"

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -1258,7 +1258,7 @@
     extensions->textureSRGBDecode = functions->hasGLExtension("GL_EXT_texture_sRGB_decode") ||
                                     functions->hasGLESExtension("GL_EXT_texture_sRGB_decode");
 
-#if defined(ANGLE_PLATFORM_MACOS)
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
     VendorID vendor = GetVendorID(functions);
     if ((IsAMD(vendor) || IsIntel(vendor)) && *maxSupportedESVersion >= gl::Version(3, 0))
     {

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp (252249 => 252250)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp	2019-11-08 19:54:49 UTC (rev 252249)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp	2019-11-08 19:55:56 UTC (rev 252250)
@@ -6387,7 +6387,7 @@
                     context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
                     return false;
                 }
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
                 const TextureType expectedType { TextureType::_2D };
 #else
                 const TextureType expectedType { TextureType::Rectangle };

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to