2 changed files
angle.apple.patch | ||
angle.visionos.patch | ||
Add comment 1 diff --git a/BUILD.gn b/BUILD.gn
Add comment 2 Minus index e38b2bef89..e3c04a220f 100644
Add comment 2 Plus index 5cb322eecf..a72313b572 100644
Add comment 3 --- a/BUILD.gn
Add comment 4 +++ b/BUILD.gn
Add comment 5 Minus @@ -666,6 +666,7 @@ angle_static_library("angle_gpu_info_util") {
Add comment 5 Plus @@ -667,6 +667,7 @@ angle_static_library("angle_gpu_info_util") {
Add comment 6
Add comment 7 if (is_apple) {
Add comment 8 frameworks = [
Add comment 10 "IOKit.framework",
Add comment 11 "CoreFoundation.framework",
Add comment 12 "CoreGraphics.framework",
Add comment 13 Minus @@ -675,12 +676,12 @@ angle_static_library("angle_gpu_info_util") {
Add comment 13 Plus @@ -676,12 +677,12 @@ angle_static_library("angle_gpu_info_util") {
Add comment 14 } else if (angle_enable_cgl) {
Add comment 15 frameworks += [ "OpenGL.framework" ]
Add comment 16 }
Add comment 26 }
Add comment 27 }
Add comment 28
Add comment 29 Plus diff --git a/src/common/system_utils.cpp b/src/common/system_utils.cpp
Add comment 30 Plus index 44921be4ed..be73ef8e5c 100644
Add comment 31 Plus --- a/src/common/system_utils.cpp
Add comment 32 Plus +++ b/src/common/system_utils.cpp
Add comment 33 Plus @@ -226,7 +226,7 @@ void *OpenSystemLibraryAndGetError(const char *libraryName,
Add comment 34 Plus {
Add comment 35 Plus libraryWithExtension += dotExtension;
Add comment 36 Plus }
Add comment 37 Plus -#if ANGLE_PLATFORM_IOS_FAMILY
Add comment 38 Plus +#ifdef ANGLE_PLATFORM_APPLE
Add comment 39 Plus // On iOS, libraryWithExtension is a directory in which the library resides.
Add comment 40 Plus // The actual library name doesn't have an extension at all.
Add comment 41 Plus // E.g. "libEGL.framework/libEGL"
Add comment 29 42 diff --git a/src/common/system_utils_mac.cpp b/src/common/system_utils_mac.cpp
Add comment 30 43 index 2c48a7eb04..18d0b32313 100644
Add comment 31 44 --- a/src/common/system_utils_mac.cpp
Add comment 72 if ([device supportsFamily:MTLGPUFamilyMac2])
Add comment 73 gpuFamilySufficient = true;
Add comment 74 diff --git a/src/common/platform.h b/src/common/platform.h
Add comment 75 Minus index edadfcde62..a96f65c1e5 100644
Add comment 75 Plus index d7c9caf680..99c7f851de 100644
Add comment 76 --- a/src/common/platform.h
Add comment 77 +++ b/src/common/platform.h
Add comment 78 @@ -151,6 +151,8 @@
Add comment 85 # endif
Add comment 86 # // Identify Metal API >= what shipped on macOS Catalina.
Add comment 87 diff --git a/src/libANGLE/renderer/metal/DisplayMtl.mm b/src/libANGLE/renderer/metal/DisplayMtl.mm
Add comment 88 Minus index a860b6bbc2..986292a966 100644
Add comment 88 Plus index b93adbbe07..445db45414 100644
Add comment 89 --- a/src/libANGLE/renderer/metal/DisplayMtl.mm
Add comment 90 +++ b/src/libANGLE/renderer/metal/DisplayMtl.mm
Add comment 91 @@ -769,7 +769,7 @@ void DisplayMtl::ensureCapsInitialized() const
Add comment 165 // If depth/stencil attachment has depth & stencil bits, then depth & stencil must not have
Add comment 166 // separate attachment. i.e. They must be the same texture or one of them has no
Add comment 167 diff --git a/src/libANGLE/renderer/metal/mtl_command_buffer.mm b/src/libANGLE/renderer/metal/mtl_command_buffer.mm
Add comment 168 Minus index 145400aec7..537f2bd32c 100644
Add comment 168 Plus index c5b9b6a467..6867e45ebc 100644
Add comment 169 --- a/src/libANGLE/renderer/metal/mtl_command_buffer.mm
Add comment 170 +++ b/src/libANGLE/renderer/metal/mtl_command_buffer.mm
Add comment 171 @@ -380,7 +380,7 @@ inline void UseResourceCmd(id<MTLRenderCommandEncoder> encoder, IntermediateComm
Add comment 177 {
Add comment 178 [encoder useResource:resource usage:usage stages:stages];
Add comment 179 }
Add comment 180 Plus @@ -403,7 +403,7 @@ inline void MemoryBarrierCmd(id<MTLRenderCommandEncoder> encoder, IntermediateCo
Add comment 181 Plus ANGLE_UNUSED_VARIABLE(after);
Add comment 182 Plus ANGLE_UNUSED_VARIABLE(before);
Add comment 183 Plus #if defined(__MAC_10_14) && (TARGET_OS_OSX || TARGET_OS_MACCATALYST)
Add comment 184 Plus - if (ANGLE_APPLE_AVAILABLE_XC(10.14, 13.1))
Add comment 185 Plus + if (ANGLE_APPLE_AVAILABLE_XC(10.14, 13.1, 1.0))
Add comment 186 Plus {
Add comment 187 Plus [encoder memoryBarrierWithScope:scope afterStages:after beforeStages:before];
Add comment 188 Plus }
Add comment 189 Plus @@ -419,7 +419,7 @@ inline void MemoryBarrierWithResourceCmd(id<MTLRenderCommandEncoder> encoder,
Add comment 190 Plus ANGLE_UNUSED_VARIABLE(after);
Add comment 191 Plus ANGLE_UNUSED_VARIABLE(before);
Add comment 192 Plus #if defined(__MAC_10_14) && (TARGET_OS_OSX || TARGET_OS_MACCATALYST)
Add comment 193 Plus - if (ANGLE_APPLE_AVAILABLE_XC(10.14, 13.1))
Add comment 194 Plus + if (ANGLE_APPLE_AVAILABLE_XC(10.14, 13.1, 1.0))
Add comment 195 Plus {
Add comment 196 Plus [encoder memoryBarrierWithResources:&resource
Add comment 197 Plus count:1
Add comment 180 198 diff --git a/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm b/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
Add comment 181 199 index f11e0150a7..c586c799a3 100644
Add comment 182 200 --- a/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
Add comment 253 271 #else
Add comment 254 272 desc.resourceOptions = MTLResourceStorageModeManaged;
Add comment 255 273 diff --git a/src/libANGLE/renderer/metal/mtl_utils.mm b/src/libANGLE/renderer/metal/mtl_utils.mm
Add comment 256 Minus index 14bc3a52fb..8948ec8211 100644
Add comment 274 Plus index 14bc3a52fb..18aa6a9828 100644
Add comment 257 275 --- a/src/libANGLE/renderer/metal/mtl_utils.mm
Add comment 258 276 +++ b/src/libANGLE/renderer/metal/mtl_utils.mm
Add comment 259 277 @@ -135,7 +135,7 @@ void StartFrameCapture(id<MTLDevice> metalDevice, id<MTLCommandQueue> metalCmdQu
Add comment 274 292 {
Add comment 275 293 auto captureDescriptor = mtl::adoptObjCObj([[MTLCaptureDescriptor alloc] init]);
Add comment 276 294 captureDescriptor.get().captureObject = metalDevice;
Add comment 295 Plus @@ -759,7 +759,7 @@ uint32_t GetDeviceVendorId(id<MTLDevice> metalDevice)
Add comment 296 Plus {
Add comment 297 Plus uint32_t vendorId = 0;
Add comment 298 Plus #if TARGET_OS_OSX || TARGET_OS_MACCATALYST
Add comment 299 Plus - if (ANGLE_APPLE_AVAILABLE_XC(10.13, 13.1))
Add comment 300 Plus + if (ANGLE_APPLE_AVAILABLE_XC(10.13, 13.1, 1.0))
Add comment 301 Plus {
Add comment 302 Plus vendorId = GetDeviceVendorIdFromIOKit(metalDevice);
Add comment 303 Plus }
Add comment 277 304 @@ -789,7 +789,7 @@ static MTLLanguageVersion GetUserSetOrHighestMSLVersion(const MTLLanguageVersion
Add comment 278 305 switch (minor)
Add comment 279 306 {