4 changed files
angle.apple.patch | ||
angle.visionos.patch | ||
chromium.build.visionos.patch | ||
variable_rasterization_rate_map.patch | ||
Add comment 1 diff --git a/BUILD.gn b/BUILD.gn
Add comment 2 Minus index 61f96e692..0fb4f7858 100644
Add comment 2 Plus index 4cd1b6928..8c57319ff 100644
Add comment 3 --- a/BUILD.gn
Add comment 4 +++ b/BUILD.gn
Add comment 5 @@ -694,6 +694,7 @@ angle_static_library("angle_gpu_info_util") {
Add comment 145 {
Add comment 146 ForceGPUSwitchIndex(info);
Add comment 147 }
Add comment 148 Minus diff --git a/src/libANGLE/renderer/metal/mtl_resources.mm b/src/libANGLE/renderer/metal/mtl_resources.mm
Add comment 149 Minus index dff8c6c9e..3e54bef8e 100644
Add comment 150 Minus --- a/src/libANGLE/renderer/metal/mtl_resources.mm
Add comment 151 Minus +++ b/src/libANGLE/renderer/metal/mtl_resources.mm
Add comment 152 Minus @@ -432,10 +432,10 @@ Texture::Texture(ContextMtl *context,
Add comment 153 Minus
Add comment 154 Minus if (memoryLess)
Add comment 155 Minus {
Add comment 156 Minus - bool supportsMemoryless = false;
Add comment 157 Minus #if (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
Add comment 158 Minus - supportsMemoryless = true;
Add comment 159 Minus + desc.resourceOptions = MTLResourceStorageModeMemoryless;
Add comment 160 Minus #else
Add comment 161 Minus + bool supportsMemoryless = false;
Add comment 162 Minus if (ANGLE_APPLE_AVAILABLE_XC(11.0, 14.1))
Add comment 163 Minus {
Add comment 164 Minus supportsMemoryless = context->getDisplay()->supportsAppleGPUFamily(1);
Add comment 165 148 diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni
Add comment 166 149 index 41bd81aa1..b6b36ccb4 100644
Add comment 167 150 --- a/src/libGLESv2.gni
Add comment 109 mHasMetalSharedEvents = true;
Add comment 110 }
Add comment 111 diff --git a/src/libANGLE/renderer/metal/DisplayMtl.mm b/src/libANGLE/renderer/metal/DisplayMtl.mm
Add comment 112 Minus index 0d5a5e8b9..520fd803f 100644
Add comment 112 Plus index 39457084d..3388753f6 100644
Add comment 113 --- a/src/libANGLE/renderer/metal/DisplayMtl.mm
Add comment 114 +++ b/src/libANGLE/renderer/metal/DisplayMtl.mm
Add comment 115 @@ -759,7 +759,7 @@ void DisplayMtl::ensureCapsInitialized() const
Add comment 146 {
Add comment 147 mNativeExtensions.depthClampEXT = true;
Add comment 148 }
Add comment 149 Minus @@ -1025,7 +1025,7 @@ void DisplayMtl::initializeExtensions() const
Add comment 149 Plus @@ -1022,7 +1022,7 @@ void DisplayMtl::initializeExtensions() const
Add comment 150
Add comment 151 mNativeExtensions.sampleVariablesOES = true;
Add comment 152
Add comment 155 {
Add comment 156 mNativeExtensions.shaderMultisampleInterpolationOES =
Add comment 157 [mMetalDevice supportsPullModelInterpolation];
Add comment 158 Minus @@ -1098,7 +1098,7 @@ void DisplayMtl::initializeExtensions() const
Add comment 158 Plus @@ -1095,7 +1095,7 @@ void DisplayMtl::initializeExtensions() const
Add comment 159 mNativeExtensions.provokingVertexANGLE = true;
Add comment 160
Add comment 161 // GL_EXT_blend_func_extended
Add comment 164 {
Add comment 165 mNativeExtensions.blendFuncExtendedEXT = true;
Add comment 166 mNativeCaps.maxDualSourceDrawBuffers = 1;
Add comment 167 Minus @@ -1399,7 +1399,7 @@ bool DisplayMtl::supportsEitherGPUFamily(uint8_t iOSFamily, uint8_t macFamily) c
Add comment 167 Plus @@ -1396,7 +1396,7 @@ bool DisplayMtl::supportsEitherGPUFamily(uint8_t iOSFamily, uint8_t macFamily) c
Add comment 168
Add comment 169 bool DisplayMtl::supportsMetal2_1() const
Add comment 170 {
Add comment 173 {
Add comment 174 return true;
Add comment 175 }
Add comment 176 Minus @@ -1410,7 +1410,7 @@ bool DisplayMtl::supportsMetal2_1() const
Add comment 176 Plus @@ -1407,7 +1407,7 @@ bool DisplayMtl::supportsMetal2_1() const
Add comment 177 }
Add comment 178 bool DisplayMtl::supportsMetal2_2() const
Add comment 179 {
Add comment 182 {
Add comment 183 return true;
Add comment 184 }
Add comment 185 Minus @@ -1425,7 +1425,7 @@ bool DisplayMtl::supports32BitFloatFiltering() const
Add comment 186 Minus #if (defined(__MAC_11_0) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_11_0) || \
Add comment 187 Minus (defined(__IPHONE_14_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_14_0) || \
Add comment 188 Minus (defined(__TVOS_14_0) && __TV_OS_VERSION_MIN_REQUIRED >= __TVOS_14_0)
Add comment 189 Minus - if (@available(ios 14.0, macOS 11.0, *))
Add comment 190 Minus + if (@available(iOS 14.0, macOS 11.0, visionOS 1.0, *))
Add comment 185 Plus @@ -1422,7 +1422,7 @@ bool DisplayMtl::supports32BitFloatFiltering() const
Add comment 186 Plus #if ((TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000) || \
Add comment 187 Plus (TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000) || \
Add comment 188 Plus (TARGET_OS_TV && __TV_OS_VERSION_MAX_ALLOWED >= 160000) || TARGET_OS_VISION)
Add comment 189 Plus - if (@available(macOS 11.0, macCatalyst 14.0, iOS 14.0, tvOS 16.0, *))
Add comment 190 Plus + if (@available(macOS 11.0, macCatalyst 14.0, iOS 14.0, tvOS 16.0, visionOS 1.0, *))
Add comment 191 {
Add comment 192 return [mMetalDevice supports32BitFloatFiltering];
Add comment 193 }
Add comment 204 {
Add comment 205 // If depth/stencil attachment has depth & stencil bits, then depth & stencil must not have
Add comment 206 // separate attachment. i.e. They must be the same texture or one of them has no
Add comment 207 Minus diff --git a/src/libANGLE/renderer/metal/gen_mtl_format_table.py b/src/libANGLE/renderer/metal/gen_mtl_format_table.py
Add comment 208 Minus index 07eb14aef..1d12b5b8d 100644
Add comment 209 Minus --- a/src/libANGLE/renderer/metal/gen_mtl_format_table.py
Add comment 210 Minus +++ b/src/libANGLE/renderer/metal/gen_mtl_format_table.py
Add comment 211 Minus @@ -473,7 +473,7 @@ def gen_image_map_switch_string(image_table, angle_to_gl):
Add comment 212 Minus for angle_format in sorted(sim_override.keys()):
Add comment 213 Minus switch_data += gen_image_map_switch_simple_case(angle_format, sim_override[angle_format],
Add comment 214 Minus angle_to_gl, sim_angle_to_mtl)
Add comment 215 Minus - switch_data += "#if TARGET_OS_IOS\n"
Add comment 216 Minus + switch_data += "#if TARGET_OS_IOS || TARGET_OS_VISION\n"
Add comment 217 Minus for angle_format in sorted(astc_tpl_map.keys()):
Add comment 218 Minus switch_data += gen_image_map_switch_astc_case_iosmac(angle_format, angle_to_gl,
Add comment 219 Minus astc_tpl_map)
Add comment 220 Minus @@ -491,7 +491,7 @@ def gen_image_map_switch_string(image_table, angle_to_gl):
Add comment 221 Minus for angle_format in sorted(ios_override.keys()):
Add comment 222 Minus switch_data += gen_image_map_switch_simple_case(angle_format, ios_override[angle_format],
Add comment 223 Minus angle_to_gl, ios_angle_to_mtl)
Add comment 224 Minus - switch_data += "#if TARGET_OS_IOS\n"
Add comment 225 Minus + switch_data += "#if TARGET_OS_IOS || TARGET_OS_VISION\n"
Add comment 226 Minus for angle_format in sorted(astc_tpl_map.keys()):
Add comment 227 Minus switch_data += gen_image_map_switch_astc_case_iosmac(angle_format, angle_to_gl,
Add comment 228 Minus astc_tpl_map)
Add comment 229 Minus @@ -501,7 +501,7 @@ def gen_image_map_switch_string(image_table, angle_to_gl):
Add comment 230 Minus for angle_format in sorted(astc_tpl_map.keys()):
Add comment 231 Minus switch_data += gen_image_map_switch_astc_case_tv_watchos(angle_format, angle_to_gl,
Add comment 232 Minus astc_tpl_map)
Add comment 233 Minus - switch_data += "#endif // TARGET_OS_IOS || TARGET_OS_TV\n"
Add comment 234 Minus + switch_data += "#endif // TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV\n"
Add comment 235 Minus switch_data += "#endif // TARGET_OS_IPHONE\n"
Add comment 236 Minus
Add comment 237 Minus # Try to support all iOS formats on newer macOS with Apple GPU.
Add comment 238 Minus @@ -564,7 +564,7 @@ def gen_image_mtl_to_angle_switch_string(image_table):
Add comment 239 Minus for angle_format in sorted(astc_tpl_map.keys()):
Add comment 240 Minus switch_data += case_image_mtl_to_angle_template.format(
Add comment 241 Minus mtl_format=astc_tpl_map[angle_format] + "LDR", angle_format=angle_format)
Add comment 242 Minus - switch_data += "#if TARGET_OS_IOS || TARGET_OS_OSX \n"
Add comment 243 Minus + switch_data += "#if TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX \n"
Add comment 244 Minus for angle_format in sorted(astc_tpl_map.keys()):
Add comment 245 Minus switch_data += case_image_mtl_to_angle_template.format(
Add comment 246 Minus mtl_format=astc_tpl_map[angle_format] + "HDR", angle_format=angle_format)
Add comment 247 Minus @@ -674,7 +674,7 @@ def gen_mtl_format_caps_init_string(map_image):
Add comment 248 Minus
Add comment 249 Minus caps_init_str += caps_to_cpp(ios_platform_caps)
Add comment 250 Minus
Add comment 251 Minus - caps_init_str += "#if TARGET_OS_IOS || TARGET_OS_OSX\n"
Add comment 252 Minus + caps_init_str += "#if TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX\n"
Add comment 253 Minus caps_init_str += caps_to_cpp(ios_specific_caps)
Add comment 254 Minus caps_init_str += "#endif // TARGET_OS_IOS || mac 11.0+ \n"
Add comment 255 Minus caps_init_str += "#endif // TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST || mac 11.0+ \n"
Add comment 256 207 diff --git a/src/libANGLE/renderer/metal/mtl_command_buffer.mm b/src/libANGLE/renderer/metal/mtl_command_buffer.mm
Add comment 257 Minus index 8060b9699..2400e430c 100644
Add comment 208 Plus index f1633a6d3..d71a992e3 100644
Add comment 258 209 --- a/src/libANGLE/renderer/metal/mtl_command_buffer.mm
Add comment 259 210 +++ b/src/libANGLE/renderer/metal/mtl_command_buffer.mm
Add comment 260 Minus @@ -380,7 +380,7 @@ inline void UseResourceCmd(id<MTLRenderCommandEncoder> encoder, IntermediateComm
Add comment 211 Plus @@ -381,7 +381,7 @@ inline void UseResourceCmd(id<MTLRenderCommandEncoder> encoder, IntermediateComm
Add comment 261 212 mtl::RenderStages stages = stream->fetch<mtl::RenderStages>();
Add comment 262 213 ANGLE_UNUSED_VARIABLE(stages);
Add comment 263 214 #if defined(__IPHONE_13_0) || defined(__MAC_10_15)
Add comment 279 230 {
Add comment 280 231 return [get() hasUnifiedMemory];
Add comment 281 232 }
Add comment 282 Minus diff --git a/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm b/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
Add comment 283 Minus index 8f4a68058..1425b2276 100644
Add comment 284 Minus --- a/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
Add comment 285 Minus +++ b/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
Add comment 286 Minus @@ -266,7 +266,7 @@ angle::FormatID Format::MetalToAngleFormatID(MTLPixelFormat formatMtl)
Add comment 287 Minus return angle::FormatID::ASTC_8x6_UNORM_BLOCK;
Add comment 288 Minus case MTLPixelFormatASTC_8x8_LDR:
Add comment 289 Minus return angle::FormatID::ASTC_8x8_UNORM_BLOCK;
Add comment 290 Minus -# if TARGET_OS_IOS || TARGET_OS_OSX
Add comment 291 Minus +# if TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX
Add comment 292 Minus case MTLPixelFormatASTC_10x10_HDR:
Add comment 293 Minus return angle::FormatID::ASTC_10x10_UNORM_BLOCK;
Add comment 294 Minus case MTLPixelFormatASTC_10x5_HDR:
Add comment 295 Minus @@ -1199,7 +1199,7 @@ void Format::init(const DisplayMtl *display, angle::FormatID intendedFormatId_)
Add comment 296 Minus this->initFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
Add comment 297 Minus break;
Add comment 298 Minus
Add comment 299 Minus -# if TARGET_OS_IOS
Add comment 300 Minus +# if TARGET_OS_IOS || TARGET_OS_VISION
Add comment 301 Minus case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
Add comment 302 Minus
Add comment 303 Minus if (display->supportsAppleGPUFamily(6))
Add comment 304 Minus @@ -1723,7 +1723,7 @@ void Format::init(const DisplayMtl *display, angle::FormatID intendedFormatId_)
Add comment 305 Minus this->actualFormatId = angle::FormatID::D32_FLOAT_S8X24_UINT;
Add comment 306 Minus break;
Add comment 307 Minus
Add comment 308 Minus -# if TARGET_OS_IOS
Add comment 309 Minus +# if TARGET_OS_IOS || TARGET_OS_VISION
Add comment 310 Minus case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
Add comment 311 Minus
Add comment 312 Minus if (display->supportsAppleGPUFamily(6))
Add comment 313 Minus @@ -4127,7 +4127,7 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
Add comment 314 Minus /** colorRenderable*/ display->supportsAppleGPUFamily(1),
Add comment 315 Minus /** depthRenderable*/ false);
Add comment 316 Minus
Add comment 317 Minus -# if TARGET_OS_IOS || TARGET_OS_OSX
Add comment 318 Minus +# if TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_OSX
Add comment 319 Minus setFormatCaps(MTLPixelFormatASTC_10x10_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
Add comment 320 Minus /** writable*/ false, /** blendable*/ false, /** multisample*/ false,
Add comment 321 Minus /** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
Add comment 322 233 diff --git a/src/libANGLE/renderer/metal/mtl_format_utils.mm b/src/libANGLE/renderer/metal/mtl_format_utils.mm
Add comment 323 234 index 42ea015fd..f04c6f0b5 100644
Add comment 324 235 --- a/src/libANGLE/renderer/metal/mtl_format_utils.mm
Add comment 333 244 case MTLPixelFormatPVRTC_RGB_2BPP:
Add comment 334 245 case MTLPixelFormatPVRTC_RGB_2BPP_sRGB:
Add comment 335 246 diff --git a/src/libANGLE/renderer/metal/mtl_resources.mm b/src/libANGLE/renderer/metal/mtl_resources.mm
Add comment 336 Minus index 3e54bef8e..42a431239 100644
Add comment 247 Plus index 1b20954c4..0fc9bfe25 100644
Add comment 337 248 --- a/src/libANGLE/renderer/metal/mtl_resources.mm
Add comment 338 249 +++ b/src/libANGLE/renderer/metal/mtl_resources.mm
Add comment 339 Minus @@ -432,7 +432,7 @@ Texture::Texture(ContextMtl *context,
Add comment 340 Minus
Add comment 250 Plus @@ -433,7 +433,7 @@ Texture::Texture(ContextMtl *context,
Add comment 341 251 if (memoryLess)
Add comment 342 252 {
Add comment 253 Plus bool supportsMemoryless = false;
Add comment 343 254 -#if (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
Add comment 344 255 +#if (TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION) && !TARGET_OS_MACCATALYST
Add comment 345 Minus desc.resourceOptions = MTLResourceStorageModeMemoryless;
Add comment 256 Plus supportsMemoryless = true;
Add comment 346 257 #else
Add comment 347 Minus bool supportsMemoryless = false;
Add comment 258 Plus if (ANGLE_APPLE_AVAILABLE_XC(11.0, 14.1))
Add comment 348 259 @@ -510,7 +510,7 @@ Texture::Texture(ContextMtl *context,
Add comment 349 260 desc.usage |= MTLTextureUsageRenderTarget;
Add comment 350 261 }
Add comment 355 266 #else
Add comment 356 267 desc.resourceOptions = MTLResourceStorageModeManaged;
Add comment 357 268 diff --git a/src/libANGLE/renderer/metal/mtl_utils.mm b/src/libANGLE/renderer/metal/mtl_utils.mm
Add comment 358 Minus index b16fdeab5..d1a5a6b64 100644
Add comment 269 Plus index 81197f9d1..907079df8 100644
Add comment 359 270 --- a/src/libANGLE/renderer/metal/mtl_utils.mm
Add comment 360 271 +++ b/src/libANGLE/renderer/metal/mtl_utils.mm
Add comment 361 Minus @@ -136,7 +136,7 @@ void StartFrameCapture(id<MTLDevice> metalDevice, id<MTLCommandQueue> metalCmdQu
Add comment 272 Plus @@ -189,7 +189,7 @@ void StartFrameCapture(id<MTLDevice> metalDevice, id<MTLCommandQueue> metalCmdQu
Add comment 362 273 }
Add comment 363 274
Add comment 364 275 # ifdef __MAC_10_15
Add comment 367 278 {
Add comment 368 279 auto captureDescriptor = mtl::adoptObjCObj([[MTLCaptureDescriptor alloc] init]);
Add comment 369 280 captureDescriptor.get().captureObject = metalDevice;
Add comment 370 Minus @@ -164,7 +164,7 @@ void StartFrameCapture(id<MTLDevice> metalDevice, id<MTLCommandQueue> metalCmdQu
Add comment 281 Plus @@ -222,7 +222,7 @@ void StartFrameCapture(id<MTLDevice> metalDevice, id<MTLCommandQueue> metalCmdQu
Add comment 371 282 }
Add comment 372 283 else
Add comment 373 284 # endif // __MAC_10_15
Add comment 376 287 {
Add comment 377 288 auto captureDescriptor = mtl::adoptObjCObj([[MTLCaptureDescriptor alloc] init]);
Add comment 378 289 captureDescriptor.get().captureObject = metalDevice;
Add comment 379 Minus @@ -791,7 +791,7 @@ static MTLLanguageVersion GetUserSetOrHighestMSLVersion(const MTLLanguageVersion
Add comment 290 Plus @@ -855,7 +855,7 @@ static MTLLanguageVersion GetUserSetOrHighestMSLVersion(const MTLLanguageVersion
Add comment 380 291 {
Add comment 381 292 #if (defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_9_0) && \
Add comment 382 293 (!defined(__IPHONE_16_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_16_0) && \
Add comment 385 296 case 0:
Add comment 386 297 return MTLLanguageVersion1_0;
Add comment 387 298 #endif
Add comment 388 Minus @@ -890,7 +890,7 @@ AutoObjCPtr<id<MTLLibrary>> CreateShaderLibrary(
Add comment 299 Plus @@ -954,7 +954,7 @@ AutoObjCPtr<id<MTLLibrary>> CreateShaderLibrary(
Add comment 389 300 // Mark all positions in VS with attribute invariant as non-optimizable
Add comment 390 301 bool canPerserveInvariance = false;
Add comment 391 302 #if defined(__MAC_11_0) || defined(__IPHONE_14_0) || defined(__TVOS_14_0)
Add comment 394 305 {
Add comment 395 306 canPerserveInvariance = true;
Add comment 396 307 options.preserveInvariance = usesInvariance;
Add comment 397 Minus @@ -1487,7 +1487,7 @@ bool SupportsAppleGPUFamily(id<MTLDevice> device, uint8_t appleFamily)
Add comment 398 Minus #if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 || __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000) || \
Add comment 399 Minus (__TV_OS_VERSION_MAX_ALLOWED >= 130000)
Add comment 400 Minus // If device supports [MTLDevice supportsFamily:], then use it.
Add comment 308 Plus @@ -1552,7 +1552,7 @@ bool SupportsAppleGPUFamily(id<MTLDevice> device, uint8_t appleFamily)
Add comment 309 Plus #if (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500) || \
Add comment 310 Plus (TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000) || \
Add comment 311 Plus (TARGET_OS_TV && __TV_OS_VERSION_MAX_ALLOWED >= 130000) || TARGET_OS_WATCH || TARGET_OS_VISION
Add comment 401 312 - if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13))
Add comment 402 313 + if (ANGLE_APPLE_AVAILABLE_XCI(10.15, 13.1, 13, 1.0))
Add comment 403 314 {
Add comment 404 315 MTLGPUFamily family;
Add comment 405 316 switch (appleFamily)
Add comment 406 Minus @@ -1507,7 +1507,7 @@ bool SupportsAppleGPUFamily(id<MTLDevice> device, uint8_t appleFamily)
Add comment 407 Minus case 5:
Add comment 408 Minus family = MTLGPUFamilyApple5;
Add comment 409 Minus break;
Add comment 410 Minus -# if TARGET_OS_IOS || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000)
Add comment 411 Minus +# if TARGET_OS_IOS || TARGET_OS_VISION || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000)
Add comment 412 Minus case 6:
Add comment 413 Minus family = MTLGPUFamilyApple6;
Add comment 414 Minus break;
Add comment 415 Minus @@ -1519,11 +1519,13 @@ bool SupportsAppleGPUFamily(id<MTLDevice> device, uint8_t appleFamily)
Add comment 416 Minus family = MTLGPUFamilyApple8;
Add comment 417 Minus break;
Add comment 418 Minus # endif
Add comment 419 Minus +#if !TARGET_OS_VISION
Add comment 420 Minus # if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000 || __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000
Add comment 421 Minus case 9:
Add comment 422 Minus family = MTLGPUFamilyApple9;
Add comment 423 Minus break;
Add comment 424 Minus # endif
Add comment 425 Minus +# endif
Add comment 426 Minus # endif
Add comment 427 Minus default:
Add comment 428 Minus return false;
Add comment 429 Minus @@ -1532,7 +1534,7 @@ bool SupportsAppleGPUFamily(id<MTLDevice> device, uint8_t appleFamily)
Add comment 430 Minus } // Metal 2.2
Add comment 431 Minus #endif // __IPHONE_OS_VERSION_MAX_ALLOWED
Add comment 432 Minus
Add comment 433 Minus -#if (!TARGET_OS_IOS && !TARGET_OS_TV) || TARGET_OS_MACCATALYST || \
Add comment 434 Minus +#if (!TARGET_OS_IOS && !TARGET_OS_TV && !TARGET_OS_VISION) || TARGET_OS_MACCATALYST || \
Add comment 435 Minus (TARGET_OS_IOS && defined(__IPHONE_16_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_16_0)
Add comment 436 Minus return false;
Add comment 437 Minus #else
Add comment 438 Minus @@ -1541,7 +1543,7 @@ bool SupportsAppleGPUFamily(id<MTLDevice> device, uint8_t appleFamily)
Add comment 439 Minus MTLFeatureSet featureSet;
Add comment 440 Minus switch (appleFamily)
Add comment 441 Minus {
Add comment 442 Minus -# if TARGET_OS_IOS
Add comment 443 Minus +# if TARGET_OS_IOS || TARGET_OS_VISION
Add comment 444 Minus case 1:
Add comment 445 Minus featureSet = MTLFeatureSet_iOS_GPUFamily1_v1;
Add comment 446 Minus break;
Add comment 447 Minus @@ -1578,7 +1580,7 @@ bool SupportsMacGPUFamily(id<MTLDevice> device, uint8_t macFamily)
Add comment 317 Plus @@ -1634,7 +1634,7 @@ bool SupportsMacGPUFamily(id<MTLDevice> device, uint8_t macFamily)
Add comment 448 318 #if TARGET_OS_OSX || TARGET_OS_MACCATALYST
Add comment 449 319 # if defined(__MAC_10_15)
Add comment 450 320 // If device supports [MTLDevice supportsFamily:], then use it.
Add comment 84
Add comment 85 # Set target.
Add comment 86 common_flags = [
Add comment 87 Minus diff --git a/config/ios/codesign.py b/config/ios/codesign.py
Add comment 87 Plus diff --git a/config/apple/codesign.py b/config/apple/codesign.py
Add comment 88 index fd96f312d..b2f43cb9b 100644
Add comment 89 Minus --- a/config/ios/codesign.py
Add comment 90 Minus +++ b/config/ios/codesign.py
Add comment 89 Plus --- a/config/apple/codesign.py
Add comment 90 Plus +++ b/config/apple/codesign.py
Add comment 91 @@ -91,6 +91,8 @@ class Bundle(object):
Add comment 92 def Kind(platform, extension):
Add comment 93 if platform == 'iphonesimulator' or platform == 'iphoneos':
variable_rasterization_rate_map.patch
/variable_rasterization_rate_map.patch/variable_rasterization_rate_map.patch