Changeset 252250 in webkit

Timestamp:

Nov 8, 2019 11:55:56 AM (4 years ago)

Author:

dino@apple.com

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):

Location:

trunk/Source/ThirdParty/ANGLE/src

Files:

• common/PackedEnums.cpp (modified) (1 diff)
• common/platform.h (modified) (2 diffs)
• gpu_info_util/SystemInfo_ios.cpp (modified) (1 diff)
• gpu_info_util/SystemInfo_macos.cpp (modified) (1 diff)
• libANGLE/Display.cpp (modified) (2 diffs)
• libANGLE/formatutils.cpp (modified) (1 diff)
• libANGLE/renderer/gl/cgl/DeviceCGL.cpp (modified) (1 diff)
• libANGLE/renderer/gl/cgl/DisplayCGL.mm (modified) (1 diff)
• libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp (modified) (1 diff)
• libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp (modified) (1 diff)
• libANGLE/renderer/gl/cgl/RendererCGL.cpp (modified) (1 diff)
• libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm (modified) (1 diff)
• libANGLE/renderer/gl/eagl/DisplayEAGL.mm (modified) (1 diff)
• libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm (modified) (1 diff)
• libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp (modified) (1 diff)
• libANGLE/renderer/gl/eagl/RendererEAGL.cpp (modified) (1 diff)
• libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm (modified) (1 diff)
• libANGLE/renderer/gl/renderergl_utils.cpp (modified) (1 diff)
• libANGLE/validationES2.cpp (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/src/common/PackedEnums.cpp

@@ -375 +375 @@
 
         case EGL_TEXTURE_RECTANGLE_ANGLE:
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
             return gl::TextureType::_2D;
 #else

trunk/Source/ThirdParty/ANGLE/src/common/platform.h

@@ -116 +116 @@
 #    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
@@ -122 +122 @@
 #            define ANGLE_PLATFORM_IOS_SIMULATOR 1
 #        endif
+#        if TARGET_OS_MACCATALYST
+#            define ANGLE_PLATFORM_MACCATALYST
+#        endif
 #    endif
 #endif

trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp

@@ -28 +28 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.cpp

@@ -9 +9 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp

@@ -53 +53 @@
 #    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)
@@ -235 +235 @@
 #    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)

trunk/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp

@@ -976 +976 @@
     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

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp

@@ -9 +9 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm

@@ -9 +9 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp

@@ -10 +10 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp

@@ -10 +10 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp

@@ -9 +9 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm

@@ -9 +9 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm

@@ -28 +28 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm

@@ -26 +26 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp

@@ -29 +29 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp

@@ -28 +28 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm

@@ -28 +28 @@
 #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"

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -1259 +1259 @@
                                     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))

trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp

@@ -6388 +6388 @@
                     return false;
                 }
-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
                 const TextureType expectedType { TextureType::_2D };
 #else