Commit da7d2a43: update

angle.apple.patch

-77+1

/angle.apple.patch

View

diff --git a/BUILD.gn b/BUILD.gn

index 4cd1b6928..8c57319ff 100644

index a82081b22..3399e0d31 100644

--- a/BUILD.gn

+++ b/BUILD.gn

@@ -694,6 +694,7 @@ angle_static_library("angle_gpu_info_util") {

// On iOS, shared libraries must be loaded from within the app bundle.

directory = GetExecutableDirectory() + "/Frameworks/";

#elif ANGLE_PLATFORM_FUCHSIA

diff --git a/src/gpu_info_util/SystemInfo_macos.mm b/src/gpu_info_util/SystemInfo_macos.mm

index ca3d88092..063a96cb7 100644

--- a/src/gpu_info_util/SystemInfo_macos.mm

+++ b/src/gpu_info_util/SystemInfo_macos.mm

@@ -18,10 +18,22 @@

# include "common/gl/cgl/FunctionsCGL.h"

#endif

-#if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000

-# define HAVE_MAIN_PORT_DEFAULT 1

+#if defined(ANGLE_PLATFORM_MACOS)

+

+# if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000

+# define HAVE_MAIN_PORT_DEFAULT 1

+# else

+# define HAVE_MAIN_PORT_DEFAULT 0

+# endif

+

#else

-# define HAVE_MAIN_PORT_DEFAULT 0

+

+# if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000

+# define HAVE_MAIN_PORT_DEFAULT 1

+# else

+# define HAVE_MAIN_PORT_DEFAULT 0

+# endif

+

#endif

namespace angle

@@ -216,7 +228,7 @@ uint64_t GetGpuIDFromDisplayID(uint32_t displayID)

{

// First attempt to use query the registryID from a Metal device before falling back to CGL.

// This avoids loading the OpenGL framework when possible.

- if (@available(macOS 10.13, *))

+ if (@available(macOS 10.13, macCatalyst 13.0, *))

{

id<MTLDevice> device = CGDirectDisplayCopyCurrentMetalDevice(displayID);

if (device)

@@ -239,7 +251,7 @@ uint64_t GetGpuIDFromDisplayID(uint32_t displayID)

// Used with permission.

uint64_t GetGpuIDFromOpenGLDisplayMask(uint32_t displayMask)

{

- if (@available(macOS 10.13, *))

+ if (@available(macOS 10.13, macCatalyst 13.0, *))

{

constexpr CGLRendererProperty kCGLRPRegistryIDLow = static_cast<CGLRendererProperty>(140);

constexpr CGLRendererProperty kCGLRPRegistryIDHigh = static_cast<CGLRendererProperty>(141);

@@ -290,7 +302,7 @@ VendorID GetVendorIDFromMetalDeviceRegistryID(uint64_t registryID)

{

#if defined(ANGLE_PLATFORM_MACOS)

// On macOS, the following code is only supported since 10.13.

- if (@available(macOS 10.13, *))

+ if (@available(macOS 10.13, macCatalyst 13.0, *))

#endif

{

// Get a matching dictionary for the IOGraphicsAccelerator2

@@ -338,7 +350,9 @@ VendorID GetVendorIDFromMetalDeviceRegistryID(uint64_t registryID)

return vendorId;

}

+#if defined(ANGLE_PLATFORM_MACOS)

return 0;

+#endif

}

bool GetSystemInfo_mac(SystemInfo *info)

@@ -366,7 +380,7 @@ bool GetSystemInfo_mac(SystemInfo *info)

// Then override the activeGPUIndex field of info to reflect the current

// GPU instead of the non-intel GPU

- if (@available(macOS 10.13, *))

+ if (@available(macOS 10.13, macCatalyst 13.0, *))

{

ForceGPUSwitchIndex(info);

}

diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni

index 41bd81aa1..b6b36ccb4 100644

--- a/src/libGLESv2.gni

angle.visionos.patch

-195

/angle.visionos.patch

View

(defined(__has_include) && __has_include(<Metal/MTLResource_Private.h>))

# define ANGLE_HAVE_MTLRESOURCE_SET_OWNERSHIP_IDENTITY 1

#else

diff --git a/src/common/apple_platform_utils.h b/src/common/apple_platform_utils.h

index 6e9bf32e8..0d2d99eec 100644

--- a/src/common/apple_platform_utils.h

+++ b/src/common/apple_platform_utils.h

@@ -20,30 +20,30 @@

#if TARGET_OS_MACCATALYST

// ANGLE_APPLE_AVAILABLE_XCI: check if either of the 3 platforms (OSX/Catalyst/iOS) min verions is

// available:

-# define ANGLE_APPLE_AVAILABLE_XCI(macVer, macCatalystVer, iOSVer) \

- @available(macOS macVer, macCatalyst macCatalystVer, iOS iOSVer, *)

+# define ANGLE_APPLE_AVAILABLE_XCI(macVer, macCatalystVer, iOSVer, visionOSVer) \

+ @available(macOS macVer, macCatalyst macCatalystVer, iOS iOSVer, visionOS visionOSVer, *)

// ANGLE_APPLE_AVAILABLE_XC: check if either of the 2 platforms (OSX/Catalyst) min verions is

// available:

# define ANGLE_APPLE_AVAILABLE_XC(macVer, macCatalystVer) \

@available(macOS macVer, macCatalyst macCatalystVer, *)

// ANGLE_APPLE_AVAILABLE_CI: check if either of the 2 platforms (Catalyst/iOS) min verions is

// available:

-# define ANGLE_APPLE_AVAILABLE_CI(macCatalystVer, iOSVer) \

- @available(macCatalyst macCatalystVer, iOS iOSVer, *)

+# define ANGLE_APPLE_AVAILABLE_CI(macCatalystVer, iOSVer, visionOSVer) \

+ @available(macCatalyst macCatalystVer, iOS iOSVer, visionOS visionOSVer, *)

#else

-# define ANGLE_APPLE_AVAILABLE_XCI(macVer, macCatalystVer, iOSVer) \

- ANGLE_APPLE_AVAILABLE_XI(macVer, iOSVer)

+# define ANGLE_APPLE_AVAILABLE_XCI(macVer, macCatalystVer, iOSVer, visionOSVer) \

+ ANGLE_APPLE_AVAILABLE_XI(macVer, iOSVer, visionOSVer)

# define ANGLE_APPLE_AVAILABLE_XC(macVer, macCatalystVer) @available(macOS macVer, *)

-# define ANGLE_APPLE_AVAILABLE_CI(macCatalystVer, iOSVer) @available(iOS iOSVer, tvOS iOSVer, *)

+# define ANGLE_APPLE_AVAILABLE_CI(macCatalystVer, iOSVer, visionOSVer) @available(iOS iOSVer, tvOS iOSVer, visionOS visionOSVer, *)

#endif

// ANGLE_APPLE_AVAILABLE_XI: check if either of the 2 platforms (OSX/iOS) min verions is available:

-#define ANGLE_APPLE_AVAILABLE_XI(macVer, iOSVer) \

- @available(macOS macVer, iOS iOSVer, tvOS iOSVer, *)

+#define ANGLE_APPLE_AVAILABLE_XI(macVer, iOSVer, visionOSVer) \

+ @available(macOS macVer, iOS iOSVer, tvOS iOSVer, visionOS visionOSVer, *)

// ANGLE_APPLE_AVAILABLE_I: check if a particular iOS version is available

-#define ANGLE_APPLE_AVAILABLE_I(iOSVer) @available(iOS iOSVer, tvOS iOSVer, *)

+#define ANGLE_APPLE_AVAILABLE_I(iOSVer, visionOSVer) @available(iOS iOSVer, tvOS iOSVer, visionOS visionOSVer, *)

#if TARGET_OS_IPHONE

# if !defined(__IPHONE_11_0)

diff --git a/src/common/platform.h b/src/common/platform.h

index 16eb8ddcd..610c9eeda 100644

--- a/src/common/platform.h

# endif

#endif

diff --git a/src/libANGLE/renderer/metal/ContextMtl.mm b/src/libANGLE/renderer/metal/ContextMtl.mm

index af75302bf..48ec1d9dd 100644

--- a/src/libANGLE/renderer/metal/ContextMtl.mm

+++ b/src/libANGLE/renderer/metal/ContextMtl.mm

@@ -221,7 +221,7 @@ ContextMtl::ContextMtl(const gl::State &state,

mProvokingVertexHelper(this),

mContextDevice(GetOwnershipIdentity(attribs))

{

- if (@available(iOS 12.0, macOS 10.14, *))

+ if (@available(iOS 12.0, macOS 10.14, visionOS 1.0, *))

{

mHasMetalSharedEvents = true;

}

diff --git a/src/libANGLE/renderer/metal/DisplayMtl.mm b/src/libANGLE/renderer/metal/DisplayMtl.mm

index b9568e0dd..21f7ea184 100644

--- a/src/libANGLE/renderer/metal/DisplayMtl.mm

+++ b/src/libANGLE/renderer/metal/DisplayMtl.mm

@@ -757,7 +757,7 @@ void DisplayMtl::ensureCapsInitialized() const

// for now. http://anglebug.com/42263403

// NOTE(kpiddington): This seems to be fixed in macOS Monterey

- if (ANGLE_APPLE_AVAILABLE_XCI(12.0, 15.0, 15.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(12.0, 15.0, 15.0, 1.0))

{

mNativeCaps.maxAliasedPointSize = 511;

}

@@ -916,7 +916,7 @@ void DisplayMtl::ensureCapsInitialized() const

mNativeLimitations.squarePvrtc1 = true;

// Older Metal does not support compressed formats for TEXTURE_3D target.

- if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13.0, 1.0))

{

mNativeLimitations.noCompressedTexture3D = !supportsEitherGPUFamily(3, 1);

}

@@ -953,7 +953,7 @@ void DisplayMtl::initializeExtensions() const

mNativeExtensions.copyCompressedTextureCHROMIUM = false;

mNativeExtensions.textureMirrorClampToEdgeEXT = true;

- if (ANGLE_APPLE_AVAILABLE_XCI(10.11, 13.1, 11.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.11, 13.1, 11.0, 1.0))

{

mNativeExtensions.depthClampEXT = true;

}

@@ -1017,7 +1017,7 @@ void DisplayMtl::initializeExtensions() const

mNativeExtensions.sampleVariablesOES = true;

- if (ANGLE_APPLE_AVAILABLE_XCI(11.0, 14.0, 14.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(11.0, 14.0, 14.0, 1.0))

{

mNativeExtensions.shaderMultisampleInterpolationOES =

[mMetalDevice supportsPullModelInterpolation];

@@ -1090,7 +1090,7 @@ void DisplayMtl::initializeExtensions() const

mNativeExtensions.provokingVertexANGLE = true;

// GL_EXT_blend_func_extended

- if (ANGLE_APPLE_AVAILABLE_XCI(10.12, 13.1, 11.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.12, 13.1, 11.0, 1.0))

{

mNativeExtensions.blendFuncExtendedEXT = true;

mNativeCaps.maxDualSourceDrawBuffers = 1;

@@ -1391,7 +1391,7 @@ bool DisplayMtl::supportsEitherGPUFamily(uint8_t iOSFamily, uint8_t macFamily) c

bool DisplayMtl::supportsMetal2_1() const

{

- if (ANGLE_APPLE_AVAILABLE_XCI(10.14, 13.1, 12.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.14, 13.1, 12.0, 1.0))

{

return true;

}

@@ -1402,7 +1402,7 @@ bool DisplayMtl::supportsMetal2_1() const

}

bool DisplayMtl::supportsMetal2_2() const

{

- if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13.0, 1.0))

{

return true;

}

diff --git a/src/libANGLE/renderer/metal/FrameBufferMtl.mm b/src/libANGLE/renderer/metal/FrameBufferMtl.mm

index fc6479543..32b230606 100644

--- a/src/libANGLE/renderer/metal/FrameBufferMtl.mm

+++ b/src/libANGLE/renderer/metal/FrameBufferMtl.mm

@@ -688,7 +688,7 @@ gl::FramebufferStatus FramebufferMtl::checkStatus(const gl::Context *context) co

gl::FramebufferStatus FramebufferMtl::checkPackedDepthStencilAttachment() const

{

- if (ANGLE_APPLE_AVAILABLE_XCI(10.14, 13.1, 12.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.14, 13.1, 12.0, 1.0))

{

// If depth/stencil attachment has depth & stencil bits, then depth & stencil must not have

// separate attachment. i.e. They must be the same texture or one of them has no

diff --git a/src/libANGLE/renderer/metal/mtl_context_device.mm b/src/libANGLE/renderer/metal/mtl_context_device.mm

index 9916d17fd..557d9d31c 100644

--- a/src/libANGLE/renderer/metal/mtl_context_device.mm

+++ b/src/libANGLE/renderer/metal/mtl_context_device.mm

@@ -131,7 +131,7 @@ void ContextDevice::setOwnerWithIdentity(id<MTLResource> resource) const

bool ContextDevice::hasUnifiedMemory() const

{

- if (@available(iOS 13.0, macOS 10.15, macCatalyst 13.1, tvOS 13.0, *))

+ if (@available(iOS 13.0, macOS 10.15, macCatalyst 13.1, tvOS 13.0, visionOS 1.0, *))

{

return [get() hasUnifiedMemory];

}

diff --git a/src/libANGLE/renderer/metal/mtl_utils.mm b/src/libANGLE/renderer/metal/mtl_utils.mm

index 2265bb0be..64d4382d0 100644

--- a/src/libANGLE/renderer/metal/mtl_utils.mm

+++ b/src/libANGLE/renderer/metal/mtl_utils.mm

@@ -189,7 +189,7 @@ void StartFrameCapture(id<MTLDevice> metalDevice, id<MTLCommandQueue> metalCmdQu

}

# ifdef __MAC_10_15

- if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13, 1.0))

{

auto captureDescriptor = mtl::adoptObjCObj([[MTLCaptureDescriptor alloc] init]);

captureDescriptor.get().captureObject = metalDevice;

@@ -222,7 +222,7 @@ void StartFrameCapture(id<MTLDevice> metalDevice, id<MTLCommandQueue> metalCmdQu

}

else

# endif // __MAC_10_15

- if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13, 1.0))

{

auto captureDescriptor = mtl::adoptObjCObj([[MTLCaptureDescriptor alloc] init]);

captureDescriptor.get().captureObject = metalDevice;

diff --git a/src/tests/test_utils/angle_test_instantiate_apple.mm b/src/tests/test_utils/angle_test_instantiate_apple.mm

index 4fa6ff2cf..738b4abbc 100644

--- a/src/tests/test_utils/angle_test_instantiate_apple.mm

+++ b/src/tests/test_utils/angle_test_instantiate_apple.mm

@@ -18,7 +18,7 @@ bool IsMetalTextureSwizzleAvailable()

{

// NOTE(hqle): This might not be accurate, since the capabilities also depend on underlying

// hardwares, however, it is OK for testing.

- if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13, 1.0))

{

// All NVIDIA and older Intel don't support swizzle because they are GPU family 1.

// We don't have a way to detect Metal family here, so skip all Intel for now.

@@ -29,7 +29,7 @@ bool IsMetalTextureSwizzleAvailable()

bool IsMetalCompressedTexture3DAvailable()

{

- if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13.0))

+ if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13.0, 1.0))

{

return true;

}

chromium.build.apple.patch

-5+5

/chromium.build.apple.patch

View

diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn

index 889cf7462..91cb0d14e 100644

index 7c3ed830e..e7d6ef5c6 100644

--- a/config/compiler/BUILD.gn

+++ b/config/compiler/BUILD.gn

@@ -1954,28 +1954,12 @@ config("default_warnings") {

}

# Some builders, such as Cronet, use a different version of Clang than

@@ -2895,7 +2879,7 @@ config("symbols") {

@@ -2899,7 +2883,7 @@ config("symbols") {

configs += [ "//build/config:compress_debug_sections" ]

}

- if (is_clang && !is_nacl && !is_chromeos) {

+ if (is_clang && !is_nacl && !is_chromeos && !is_apple) {

- if (is_clang && !is_nacl && is_win && !is_component_build) {

+ if (is_clang && !is_nacl && is_win && !is_component_build && is_apple) {

# Remove unreferenced methods to reduce type info in symbols.

# See: https://github.com/llvm/llvm-project/pull/87018.

cflags += [ "-gomit-unreferenced-methods" ]

# The downside with this flag is precisely that: Unreferenced methods get

diff --git a/config/ios/BUILD.gn b/config/ios/BUILD.gn

index 295f36de0..9dfb220d1 100644

--- a/config/ios/BUILD.gn