1
1
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
- index ed32949873a..35c10e6717e 100644
2
+ index 283778b32..4d4ddfc4b 100644
3
3
--- a/CMakeLists.txt
4
4
+++ b/CMakeLists.txt
5
- @@ -611 ,7 +611 ,11 @@ endif()
5
+ @@ -609 ,7 +609 ,11 @@ endif()
6
6
string(TOLOWER "${DIST_ARCH}" DIST_ARCH)
7
7
string(REPLACE "amd64" "x86_64" DIST_ARCH "${DIST_ARCH}")
8
8
if (NOT DIST_DIR)
@@ -16,7 +16,7 @@ index ed32949873a..35c10e6717e 100644
16
16
17
17
# ==================================================================================================
18
18
diff --git a/NEW_RELEASE_NOTES.md b/NEW_RELEASE_NOTES.md
19
- index 4a1a9c7fa7e..aa2ee9c76e0 100644
19
+ index 4a1a9c7fa..aa2ee9c76 100644
20
20
--- a/NEW_RELEASE_NOTES.md
21
21
+++ b/NEW_RELEASE_NOTES.md
22
22
@@ -7,3 +7,4 @@ for next branch cut* header.
@@ -25,10 +25,10 @@ index 4a1a9c7fa7e..aa2ee9c76e0 100644
25
25
## Release notes for next branch cut
26
26
+ - ios: Add support for Apple Silicon (arm64) simulator
27
27
diff --git a/build.sh b/build.sh
28
- index 56562cc1c6c..3cb660aa1f9 100755
28
+ index ab6440f45..c817f5a8d 100755
29
29
--- a/build.sh
30
30
+++ b/build.sh
31
- @@ -581 ,9 +581 ,9 @@ function build_ios_target {
31
+ @@ -593 ,9 +593 ,9 @@ function build_ios_target {
32
32
local platform=$3
33
33
34
34
echo "Building iOS ${lc_target} (${arch}) for ${platform}..."
@@ -40,9 +40,9 @@ index 56562cc1c6c..3cb660aa1f9 100755
40
40
41
41
if [[ ! -d "CMakeFiles" ]] || [[ "${ISSUE_CMAKE_ALWAYS}" == "true" ]]; then
42
42
cmake \
43
- @@ -598,14 +598,14 @@ function build_ios_target {
44
- ${MATDBG_OPTION} \
43
+ @@ -611,14 +611,14 @@ function build_ios_target {
45
44
${MATOPT_OPTION} \
45
+ ${STEREOSCOPIC_OPTION} \
46
46
../..
47
47
- ln -sf "out/cmake-ios-${lc_target}-${arch}/compile_commands.json" \
48
48
+ ln -sf "out/cmake-ios-${lc_target}-${arch}-${platform}/compile_commands.json" \
@@ -57,7 +57,7 @@ index 56562cc1c6c..3cb660aa1f9 100755
57
57
${BUILD_COMMAND} ${INSTALL_COMMAND}
58
58
fi
59
59
60
- @@ -640 ,16 +640 ,26 @@ function build_ios {
60
+ @@ -653 ,16 +653 ,26 @@ function build_ios {
61
61
if [[ "${ISSUE_DEBUG_BUILD}" == "true" ]]; then
62
62
build_ios_target "Debug" "arm64" "iphoneos"
63
63
if [[ "${IOS_BUILD_SIMULATOR}" == "true" ]]; then
@@ -90,7 +90,7 @@ index 56562cc1c6c..3cb660aa1f9 100755
90
90
fi
91
91
92
92
archive_ios "Debug"
93
- @@ -657 ,19 +667 ,39 @@ function build_ios {
93
+ @@ -670 ,19 +680 ,39 @@ function build_ios {
94
94
95
95
if [[ "${ISSUE_RELEASE_BUILD}" == "true" ]]; then
96
96
build_ios_target "Release" "arm64" "iphoneos"
@@ -141,7 +141,7 @@ index 56562cc1c6c..3cb660aa1f9 100755
141
141
}
142
142
diff --git a/build/ios/create-xc-frameworks.sh b/build/ios/create-xc-frameworks.sh
143
143
new file mode 100755
144
- index 00000000000..cf720cb7e4e
144
+ index 000000000..cf720cb7e
145
145
--- /dev/null
146
146
+++ b/build/ios/create-xc-frameworks.sh
147
147
@@ -0,0 +1,107 @@
@@ -253,12 +253,12 @@ index 00000000000..cf720cb7e4e
253
253
+ eval $CMD
254
254
+ done
255
255
diff --git a/ios/CocoaPods/Filament.podspec b/ios/CocoaPods/Filament.podspec
256
- index 3ed06a44db5..3ffe1632473 100644
256
+ index 45fce3980..b9674ca59 100644
257
257
--- a/ios/CocoaPods/Filament.podspec
258
258
+++ b/ios/CocoaPods/Filament.podspec
259
259
@@ -8,12 +8,6 @@ Pod::Spec.new do |spec|
260
260
spec.platform = :ios, "11.0"
261
- spec.source = { :http => "https://github.com/google/filament/releases/download/v1.51.3 /filament-v1.51.3 -ios.tgz" }
261
+ spec.source = { :http => "https://github.com/google/filament/releases/download/v1.53.0 /filament-v1.53.0 -ios.tgz" }
262
262
263
263
- # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
264
264
- spec.pod_target_xcconfig = {
@@ -402,7 +402,7 @@ index 3ed06a44db5..3ffe1632473 100644
402
402
ss.dependency "Filament/filamat"
403
403
ss.dependency "Filament/tsl"
404
404
diff --git a/ios/samples/README.md b/ios/samples/README.md
405
- index 4c132849ee4..6c9c165eabb 100644
405
+ index 4c132849e..6c9c165ea 100644
406
406
--- a/ios/samples/README.md
407
407
+++ b/ios/samples/README.md
408
408
@@ -47,7 +47,7 @@ build Filament in Release mode, replace `debug` with `release` in the above `bui
@@ -415,7 +415,7 @@ index 4c132849ee4..6c9c165eabb 100644
415
415
```
416
416
$ ./build.sh -s -p ios -i debug
417
417
diff --git a/ios/samples/app-template.yml b/ios/samples/app-template.yml
418
- index e8e14c50715..9c407448d16 100644
418
+ index e8e14c507..9c407448d 100644
419
419
--- a/ios/samples/app-template.yml
420
420
+++ b/ios/samples/app-template.yml
421
421
@@ -17,25 +17,27 @@ targetTemplates:
@@ -457,7 +457,7 @@ index e8e14c50715..9c407448d16 100644
457
457
GCC_PREPROCESSOR_DEFINITIONS: ["FILAMENT_APP_USE_METAL=1", "$(inherited)"]
458
458
opengl:
459
459
diff --git a/ios/samples/backend-test/backend-test.xcodeproj/project.pbxproj b/ios/samples/backend-test/backend-test.xcodeproj/project.pbxproj
460
- index b47f4c00e36..ea4c11fe046 100644
460
+ index b47f4c00e..ea4c11fe0 100644
461
461
--- a/ios/samples/backend-test/backend-test.xcodeproj/project.pbxproj
462
462
+++ b/ios/samples/backend-test/backend-test.xcodeproj/project.pbxproj
463
463
@@ -3,34 +3,112 @@
@@ -774,7 +774,7 @@ index b47f4c00e36..ea4c11fe046 100644
774
774
PRODUCT_BUNDLE_IDENTIFIER = "${SAMPLE_CODE_DISAMBIGUATOR}.google.filament.backend-test";
775
775
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
776
776
diff --git a/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test Metal.xcscheme b/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test Metal.xcscheme
777
- index f4026437bcd..d6462758330 100644
777
+ index f4026437b..d64627583 100644
778
778
--- a/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test Metal.xcscheme
779
779
+++ b/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test Metal.xcscheme
780
780
@@ -1,6 +1,6 @@
@@ -786,7 +786,7 @@ index f4026437bcd..d6462758330 100644
786
786
<BuildAction
787
787
parallelizeBuildables = "YES"
788
788
diff --git a/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test OpenGL.xcscheme b/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test OpenGL.xcscheme
789
- index f8b6433068d..7bf997e5a59 100644
789
+ index f8b643306..7bf997e5a 100644
790
790
--- a/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test OpenGL.xcscheme
791
791
+++ b/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test OpenGL.xcscheme
792
792
@@ -1,6 +1,6 @@
@@ -798,7 +798,7 @@ index f8b6433068d..7bf997e5a59 100644
798
798
<BuildAction
799
799
parallelizeBuildables = "YES"
800
800
diff --git a/ios/samples/backend-test/project.yml b/ios/samples/backend-test/project.yml
801
- index 37c28b099fe..75c41abdccb 100644
801
+ index 37c28b099..75c41abdc 100644
802
802
--- a/ios/samples/backend-test/project.yml
803
803
+++ b/ios/samples/backend-test/project.yml
804
804
@@ -6,8 +6,11 @@ targets:
@@ -815,7 +815,7 @@ index 37c28b099fe..75c41abdccb 100644
815
815
- OTHER_LDFLAGS: ["-lfilamat", "-force_load ../../../out/ios-debug/filament/lib/arm64/libbackend_test.a"]
816
816
+ OTHER_LDFLAGS: ["-force_load ../../../out/ios-release/filament/lib/arm64/libbackend_test.xcframework"]
817
817
diff --git a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj
818
- index 6ca453dd4fa..d8a7c70ada1 100644
818
+ index 6ca453dd4..d8a7c70ad 100644
819
819
--- a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj
820
820
+++ b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj
821
821
@@ -3,40 +3,168 @@
@@ -1241,7 +1241,7 @@ index 6ca453dd4fa..d8a7c70ada1 100644
1241
1241
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
1242
1242
SDKROOT = iphoneos;
1243
1243
diff --git a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer Metal.xcscheme b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer Metal.xcscheme
1244
- index dc8753c362b..f4eb36a1e27 100644
1244
+ index dc8753c36..f4eb36a1e 100644
1245
1245
--- a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer Metal.xcscheme
1246
1246
+++ b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer Metal.xcscheme
1247
1247
@@ -1,6 +1,6 @@
@@ -1253,7 +1253,7 @@ index dc8753c362b..f4eb36a1e27 100644
1253
1253
<BuildAction
1254
1254
parallelizeBuildables = "YES"
1255
1255
diff --git a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer OpenGL.xcscheme b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer OpenGL.xcscheme
1256
- index a3e5a224dd5..5a741c2d841 100644
1256
+ index a3e5a224d..5a741c2d8 100644
1257
1257
--- a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer OpenGL.xcscheme
1258
1258
+++ b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer OpenGL.xcscheme
1259
1259
@@ -1,6 +1,6 @@
@@ -1265,7 +1265,7 @@ index a3e5a224dd5..5a741c2d841 100644
1265
1265
<BuildAction
1266
1266
parallelizeBuildables = "YES"
1267
1267
diff --git a/ios/samples/gltf-viewer/project.yml b/ios/samples/gltf-viewer/project.yml
1268
- index 1f850dd45a0..9f1377396e1 100644
1268
+ index 1f850dd45..9f1377396 100644
1269
1269
--- a/ios/samples/gltf-viewer/project.yml
1270
1270
+++ b/ios/samples/gltf-viewer/project.yml
1271
1271
@@ -17,11 +17,20 @@ targets:
@@ -1295,7 +1295,7 @@ index 1f850dd45a0..9f1377396e1 100644
1295
1295
- path: build-resources.sh
1296
1296
name: Build Resources
1297
1297
diff --git a/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj b/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj
1298
- index 4dad82057cb..f698d8b2617 100644
1298
+ index 4dad82057..f698d8b26 100644
1299
1299
--- a/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj
1300
1300
+++ b/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj
1301
1301
@@ -3,44 +3,105 @@
@@ -1622,7 +1622,7 @@ index 4dad82057cb..f698d8b2617 100644
1622
1622
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
1623
1623
SDKROOT = iphoneos;
1624
1624
diff --git a/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar Metal.xcscheme b/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar Metal.xcscheme
1625
- index ce9c36f2bb4..359677b453b 100644
1625
+ index ce9c36f2b..359677b45 100644
1626
1626
--- a/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar Metal.xcscheme
1627
1627
+++ b/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar Metal.xcscheme
1628
1628
@@ -1,6 +1,6 @@
@@ -1634,7 +1634,7 @@ index ce9c36f2bb4..359677b453b 100644
1634
1634
<BuildAction
1635
1635
parallelizeBuildables = "YES"
1636
1636
diff --git a/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar OpenGL.xcscheme b/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar OpenGL.xcscheme
1637
- index 74d62ffb8cf..731b06cad99 100644
1637
+ index 74d62ffb8..731b06cad 100644
1638
1638
--- a/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar OpenGL.xcscheme
1639
1639
+++ b/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar OpenGL.xcscheme
1640
1640
@@ -1,6 +1,6 @@
@@ -1646,7 +1646,7 @@ index 74d62ffb8cf..731b06cad99 100644
1646
1646
<BuildAction
1647
1647
parallelizeBuildables = "YES"
1648
1648
diff --git a/ios/samples/hello-ar/project.yml b/ios/samples/hello-ar/project.yml
1649
- index 483e824a253..a62612d7681 100644
1649
+ index 483e824a2..a62612d76 100644
1650
1650
--- a/ios/samples/hello-ar/project.yml
1651
1651
+++ b/ios/samples/hello-ar/project.yml
1652
1652
@@ -7,10 +7,10 @@ targets:
@@ -1665,7 +1665,7 @@ index 483e824a253..a62612d7681 100644
1665
1665
- path: build-resources.sh
1666
1666
name: Build Resources
1667
1667
diff --git a/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj b/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj
1668
- index 9d87ed5702f..a5edb9121c5 100644
1668
+ index 9d87ed570..a5edb9121 100644
1669
1669
--- a/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj
1670
1670
+++ b/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj
1671
1671
@@ -3,44 +3,157 @@
@@ -2068,7 +2068,7 @@ index 9d87ed5702f..a5edb9121c5 100644
2068
2068
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
2069
2069
SDKROOT = iphoneos;
2070
2070
diff --git a/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf Metal.xcscheme b/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf Metal.xcscheme
2071
- index 696c235f1b1..640ecf87e2e 100644
2071
+ index 696c235f1..640ecf87e 100644
2072
2072
--- a/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf Metal.xcscheme
2073
2073
+++ b/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf Metal.xcscheme
2074
2074
@@ -1,6 +1,6 @@
@@ -2080,7 +2080,7 @@ index 696c235f1b1..640ecf87e2e 100644
2080
2080
<BuildAction
2081
2081
parallelizeBuildables = "YES"
2082
2082
diff --git a/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf OpenGL.xcscheme b/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf OpenGL.xcscheme
2083
- index 5536b9ac726..d8c4b065764 100644
2083
+ index 5536b9ac7..d8c4b0657 100644
2084
2084
--- a/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf OpenGL.xcscheme
2085
2085
+++ b/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf OpenGL.xcscheme
2086
2086
@@ -1,6 +1,6 @@
@@ -2092,7 +2092,7 @@ index 5536b9ac726..d8c4b065764 100644
2092
2092
<BuildAction
2093
2093
parallelizeBuildables = "YES"
2094
2094
diff --git a/ios/samples/hello-gltf/project.yml b/ios/samples/hello-gltf/project.yml
2095
- index 377578053d3..adfa2896ed6 100644
2095
+ index 377578053..adfa2896e 100644
2096
2096
--- a/ios/samples/hello-gltf/project.yml
2097
2097
+++ b/ios/samples/hello-gltf/project.yml
2098
2098
@@ -10,10 +10,16 @@ targets:
@@ -2117,7 +2117,7 @@ index 377578053d3..adfa2896ed6 100644
2117
2117
- path: build-resources.sh
2118
2118
name: Build Resources
2119
2119
diff --git a/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj b/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj
2120
- index c80979f4f3c..169ddb84c10 100644
2120
+ index c80979f4f..169ddb84c 100644
2121
2121
--- a/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj
2122
2122
+++ b/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj
2123
2123
@@ -3,43 +3,126 @@
@@ -2457,7 +2457,7 @@ index c80979f4f3c..169ddb84c10 100644
2457
2457
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
2458
2458
SDKROOT = iphoneos;
2459
2459
diff --git a/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr Metal.xcscheme b/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr Metal.xcscheme
2460
- index 545457ca8e3..93d88313fd9 100644
2460
+ index 545457ca8..93d88313f 100644
2461
2461
--- a/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr Metal.xcscheme
2462
2462
+++ b/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr Metal.xcscheme
2463
2463
@@ -1,6 +1,6 @@
@@ -2469,7 +2469,7 @@ index 545457ca8e3..93d88313fd9 100644
2469
2469
<BuildAction
2470
2470
parallelizeBuildables = "YES"
2471
2471
diff --git a/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr OpenGL.xcscheme b/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr OpenGL.xcscheme
2472
- index 0135777b7ec..96f3d5bab3e 100644
2472
+ index 0135777b7..96f3d5bab 100644
2473
2473
--- a/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr OpenGL.xcscheme
2474
2474
+++ b/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr OpenGL.xcscheme
2475
2475
@@ -1,6 +1,6 @@
@@ -2481,7 +2481,7 @@ index 0135777b7ec..96f3d5bab3e 100644
2481
2481
<BuildAction
2482
2482
parallelizeBuildables = "YES"
2483
2483
diff --git a/ios/samples/hello-pbr/project.yml b/ios/samples/hello-pbr/project.yml
2484
- index 36a6fd26a3e..f7daeac3e48 100644
2484
+ index 36a6fd26a..f7daeac3e 100644
2485
2485
--- a/ios/samples/hello-pbr/project.yml
2486
2486
+++ b/ios/samples/hello-pbr/project.yml
2487
2487
@@ -6,9 +6,10 @@ targets:
@@ -2499,7 +2499,7 @@ index 36a6fd26a3e..f7daeac3e48 100644
2499
2499
- path: build-resources.sh
2500
2500
name: Build Resources
2501
2501
diff --git a/ios/samples/hello-triangle/hello-triangle.xcodeproj/project.pbxproj b/ios/samples/hello-triangle/hello-triangle.xcodeproj/project.pbxproj
2502
- index fbc8f752c75..6e99ba2c111 100644
2502
+ index fbc8f752c..6e99ba2c1 100644
2503
2503
--- a/ios/samples/hello-triangle/hello-triangle.xcodeproj/project.pbxproj
2504
2504
+++ b/ios/samples/hello-triangle/hello-triangle.xcodeproj/project.pbxproj
2505
2505
@@ -3,35 +3,103 @@
@@ -2794,7 +2794,7 @@ index fbc8f752c75..6e99ba2c111 100644
2794
2794
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
2795
2795
SDKROOT = iphoneos;
2796
2796
diff --git a/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle Metal.xcscheme b/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle Metal.xcscheme
2797
- index 23e5ca4268e..d0463c46d2f 100644
2797
+ index 23e5ca426..d0463c46d 100644
2798
2798
--- a/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle Metal.xcscheme
2799
2799
+++ b/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle Metal.xcscheme
2800
2800
@@ -1,6 +1,6 @@
@@ -2806,7 +2806,7 @@ index 23e5ca4268e..d0463c46d2f 100644
2806
2806
<BuildAction
2807
2807
parallelizeBuildables = "YES"
2808
2808
diff --git a/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle OpenGL.xcscheme b/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle OpenGL.xcscheme
2809
- index 47405d4e237..94f0142df99 100644
2809
+ index 47405d4e2..94f0142df 100644
2810
2810
--- a/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle OpenGL.xcscheme
2811
2811
+++ b/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle OpenGL.xcscheme
2812
2812
@@ -1,6 +1,6 @@
@@ -2818,7 +2818,7 @@ index 47405d4e237..94f0142df99 100644
2818
2818
<BuildAction
2819
2819
parallelizeBuildables = "YES"
2820
2820
diff --git a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/project.pbxproj b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/project.pbxproj
2821
- index 331fbf6b90c..9aa01d735d7 100644
2821
+ index 331fbf6b9..9aa01d735 100644
2822
2822
--- a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/project.pbxproj
2823
2823
+++ b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/project.pbxproj
2824
2824
@@ -3,34 +3,102 @@
@@ -3114,7 +3114,7 @@ index 331fbf6b90c..9aa01d735d7 100644
3114
3114
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
3115
3115
SDKROOT = iphoneos;
3116
3116
diff --git a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering Metal.xcscheme b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering Metal.xcscheme
3117
- index 56fb8a1a6cb..ec840707f0d 100644
3117
+ index 56fb8a1a6..ec840707f 100644
3118
3118
--- a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering Metal.xcscheme
3119
3119
+++ b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering Metal.xcscheme
3120
3120
@@ -1,6 +1,6 @@
@@ -3126,7 +3126,7 @@ index 56fb8a1a6cb..ec840707f0d 100644
3126
3126
<BuildAction
3127
3127
parallelizeBuildables = "YES"
3128
3128
diff --git a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering OpenGL.xcscheme b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering OpenGL.xcscheme
3129
- index 60f7cdd5c6e..2a670e47961 100644
3129
+ index 60f7cdd5c..2a670e479 100644
3130
3130
--- a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering OpenGL.xcscheme
3131
3131
+++ b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering OpenGL.xcscheme
3132
3132
@@ -1,6 +1,6 @@
@@ -3138,7 +3138,7 @@ index 60f7cdd5c6e..2a670e47961 100644
3138
3138
<BuildAction
3139
3139
parallelizeBuildables = "YES"
3140
3140
diff --git a/third_party/clang/iOS.cmake b/third_party/clang/iOS.cmake
3141
- index a5619558834..6153cf8641e 100644
3141
+ index e9ea75e7a..ae970bdca 100644
3142
3142
--- a/third_party/clang/iOS.cmake
3143
3143
+++ b/third_party/clang/iOS.cmake
3144
3144
@@ -103,7 +103,12 @@ IF (NOT DEFINED IOS_MIN_TARGET)
@@ -3155,4 +3155,3 @@ index a5619558834..6153cf8641e 100644
3155
3155
3156
3156
SET(CMAKE_C_FLAGS_INIT "${IOS_COMMON_FLAGS}")
3157
3157
SET(CMAKE_CXX_FLAGS_INIT "${IOS_COMMON_FLAGS}")
3158
-
0 commit comments