Skip to content

Commit 9fcbfae

Browse files
committed
update ios patch
1 parent 967bb97 commit 9fcbfae

File tree

1 file changed

+41
-42
lines changed

1 file changed

+41
-42
lines changed

package/filament_ios_simulator.patch

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index ed32949873a..35c10e6717e 100644
2+
index 283778b32..4d4ddfc4b 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -611,7 +611,11 @@ endif()
5+
@@ -609,7 +609,11 @@ endif()
66
string(TOLOWER "${DIST_ARCH}" DIST_ARCH)
77
string(REPLACE "amd64" "x86_64" DIST_ARCH "${DIST_ARCH}")
88
if (NOT DIST_DIR)
@@ -16,7 +16,7 @@ index ed32949873a..35c10e6717e 100644
1616

1717
# ==================================================================================================
1818
diff --git a/NEW_RELEASE_NOTES.md b/NEW_RELEASE_NOTES.md
19-
index 4a1a9c7fa7e..aa2ee9c76e0 100644
19+
index 4a1a9c7fa..aa2ee9c76 100644
2020
--- a/NEW_RELEASE_NOTES.md
2121
+++ b/NEW_RELEASE_NOTES.md
2222
@@ -7,3 +7,4 @@ for next branch cut* header.
@@ -25,10 +25,10 @@ index 4a1a9c7fa7e..aa2ee9c76e0 100644
2525
## Release notes for next branch cut
2626
+- ios: Add support for Apple Silicon (arm64) simulator
2727
diff --git a/build.sh b/build.sh
28-
index 56562cc1c6c..3cb660aa1f9 100755
28+
index ab6440f45..c817f5a8d 100755
2929
--- a/build.sh
3030
+++ b/build.sh
31-
@@ -581,9 +581,9 @@ function build_ios_target {
31+
@@ -593,9 +593,9 @@ function build_ios_target {
3232
local platform=$3
3333

3434
echo "Building iOS ${lc_target} (${arch}) for ${platform}..."
@@ -40,9 +40,9 @@ index 56562cc1c6c..3cb660aa1f9 100755
4040

4141
if [[ ! -d "CMakeFiles" ]] || [[ "${ISSUE_CMAKE_ALWAYS}" == "true" ]]; then
4242
cmake \
43-
@@ -598,14 +598,14 @@ function build_ios_target {
44-
${MATDBG_OPTION} \
43+
@@ -611,14 +611,14 @@ function build_ios_target {
4544
${MATOPT_OPTION} \
45+
${STEREOSCOPIC_OPTION} \
4646
../..
4747
- ln -sf "out/cmake-ios-${lc_target}-${arch}/compile_commands.json" \
4848
+ ln -sf "out/cmake-ios-${lc_target}-${arch}-${platform}/compile_commands.json" \
@@ -57,7 +57,7 @@ index 56562cc1c6c..3cb660aa1f9 100755
5757
${BUILD_COMMAND} ${INSTALL_COMMAND}
5858
fi
5959

60-
@@ -640,16 +640,26 @@ function build_ios {
60+
@@ -653,16 +653,26 @@ function build_ios {
6161
if [[ "${ISSUE_DEBUG_BUILD}" == "true" ]]; then
6262
build_ios_target "Debug" "arm64" "iphoneos"
6363
if [[ "${IOS_BUILD_SIMULATOR}" == "true" ]]; then
@@ -90,7 +90,7 @@ index 56562cc1c6c..3cb660aa1f9 100755
9090
fi
9191

9292
archive_ios "Debug"
93-
@@ -657,19 +667,39 @@ function build_ios {
93+
@@ -670,19 +680,39 @@ function build_ios {
9494

9595
if [[ "${ISSUE_RELEASE_BUILD}" == "true" ]]; then
9696
build_ios_target "Release" "arm64" "iphoneos"
@@ -141,7 +141,7 @@ index 56562cc1c6c..3cb660aa1f9 100755
141141
}
142142
diff --git a/build/ios/create-xc-frameworks.sh b/build/ios/create-xc-frameworks.sh
143143
new file mode 100755
144-
index 00000000000..cf720cb7e4e
144+
index 000000000..cf720cb7e
145145
--- /dev/null
146146
+++ b/build/ios/create-xc-frameworks.sh
147147
@@ -0,0 +1,107 @@
@@ -253,12 +253,12 @@ index 00000000000..cf720cb7e4e
253253
+ eval $CMD
254254
+done
255255
diff --git a/ios/CocoaPods/Filament.podspec b/ios/CocoaPods/Filament.podspec
256-
index 3ed06a44db5..3ffe1632473 100644
256+
index 45fce3980..b9674ca59 100644
257257
--- a/ios/CocoaPods/Filament.podspec
258258
+++ b/ios/CocoaPods/Filament.podspec
259259
@@ -8,12 +8,6 @@ Pod::Spec.new do |spec|
260260
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" }
262262

263263
- # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
264264
- spec.pod_target_xcconfig = {
@@ -402,7 +402,7 @@ index 3ed06a44db5..3ffe1632473 100644
402402
ss.dependency "Filament/filamat"
403403
ss.dependency "Filament/tsl"
404404
diff --git a/ios/samples/README.md b/ios/samples/README.md
405-
index 4c132849ee4..6c9c165eabb 100644
405+
index 4c132849e..6c9c165ea 100644
406406
--- a/ios/samples/README.md
407407
+++ b/ios/samples/README.md
408408
@@ -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
415415
```
416416
$ ./build.sh -s -p ios -i debug
417417
diff --git a/ios/samples/app-template.yml b/ios/samples/app-template.yml
418-
index e8e14c50715..9c407448d16 100644
418+
index e8e14c507..9c407448d 100644
419419
--- a/ios/samples/app-template.yml
420420
+++ b/ios/samples/app-template.yml
421421
@@ -17,25 +17,27 @@ targetTemplates:
@@ -457,7 +457,7 @@ index e8e14c50715..9c407448d16 100644
457457
GCC_PREPROCESSOR_DEFINITIONS: ["FILAMENT_APP_USE_METAL=1", "$(inherited)"]
458458
opengl:
459459
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
461461
--- a/ios/samples/backend-test/backend-test.xcodeproj/project.pbxproj
462462
+++ b/ios/samples/backend-test/backend-test.xcodeproj/project.pbxproj
463463
@@ -3,34 +3,112 @@
@@ -774,7 +774,7 @@ index b47f4c00e36..ea4c11fe046 100644
774774
PRODUCT_BUNDLE_IDENTIFIER = "${SAMPLE_CODE_DISAMBIGUATOR}.google.filament.backend-test";
775775
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
776776
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
778778
--- a/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test Metal.xcscheme
779779
+++ b/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test Metal.xcscheme
780780
@@ -1,6 +1,6 @@
@@ -786,7 +786,7 @@ index f4026437bcd..d6462758330 100644
786786
<BuildAction
787787
parallelizeBuildables = "YES"
788788
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
790790
--- a/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test OpenGL.xcscheme
791791
+++ b/ios/samples/backend-test/backend-test.xcodeproj/xcshareddata/xcschemes/backend-test OpenGL.xcscheme
792792
@@ -1,6 +1,6 @@
@@ -798,7 +798,7 @@ index f8b6433068d..7bf997e5a59 100644
798798
<BuildAction
799799
parallelizeBuildables = "YES"
800800
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
802802
--- a/ios/samples/backend-test/project.yml
803803
+++ b/ios/samples/backend-test/project.yml
804804
@@ -6,8 +6,11 @@ targets:
@@ -815,7 +815,7 @@ index 37c28b099fe..75c41abdccb 100644
815815
- OTHER_LDFLAGS: ["-lfilamat", "-force_load ../../../out/ios-debug/filament/lib/arm64/libbackend_test.a"]
816816
+ OTHER_LDFLAGS: ["-force_load ../../../out/ios-release/filament/lib/arm64/libbackend_test.xcframework"]
817817
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
819819
--- a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj
820820
+++ b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj
821821
@@ -3,40 +3,168 @@
@@ -1241,7 +1241,7 @@ index 6ca453dd4fa..d8a7c70ada1 100644
12411241
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
12421242
SDKROOT = iphoneos;
12431243
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
12451245
--- a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer Metal.xcscheme
12461246
+++ b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer Metal.xcscheme
12471247
@@ -1,6 +1,6 @@
@@ -1253,7 +1253,7 @@ index dc8753c362b..f4eb36a1e27 100644
12531253
<BuildAction
12541254
parallelizeBuildables = "YES"
12551255
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
12571257
--- a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer OpenGL.xcscheme
12581258
+++ b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/xcshareddata/xcschemes/gltf-viewer OpenGL.xcscheme
12591259
@@ -1,6 +1,6 @@
@@ -1265,7 +1265,7 @@ index a3e5a224dd5..5a741c2d841 100644
12651265
<BuildAction
12661266
parallelizeBuildables = "YES"
12671267
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
12691269
--- a/ios/samples/gltf-viewer/project.yml
12701270
+++ b/ios/samples/gltf-viewer/project.yml
12711271
@@ -17,11 +17,20 @@ targets:
@@ -1295,7 +1295,7 @@ index 1f850dd45a0..9f1377396e1 100644
12951295
- path: build-resources.sh
12961296
name: Build Resources
12971297
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
12991299
--- a/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj
13001300
+++ b/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj
13011301
@@ -3,44 +3,105 @@
@@ -1622,7 +1622,7 @@ index 4dad82057cb..f698d8b2617 100644
16221622
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
16231623
SDKROOT = iphoneos;
16241624
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
16261626
--- a/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar Metal.xcscheme
16271627
+++ b/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar Metal.xcscheme
16281628
@@ -1,6 +1,6 @@
@@ -1634,7 +1634,7 @@ index ce9c36f2bb4..359677b453b 100644
16341634
<BuildAction
16351635
parallelizeBuildables = "YES"
16361636
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
16381638
--- a/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar OpenGL.xcscheme
16391639
+++ b/ios/samples/hello-ar/hello-ar.xcodeproj/xcshareddata/xcschemes/hello-ar OpenGL.xcscheme
16401640
@@ -1,6 +1,6 @@
@@ -1646,7 +1646,7 @@ index 74d62ffb8cf..731b06cad99 100644
16461646
<BuildAction
16471647
parallelizeBuildables = "YES"
16481648
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
16501650
--- a/ios/samples/hello-ar/project.yml
16511651
+++ b/ios/samples/hello-ar/project.yml
16521652
@@ -7,10 +7,10 @@ targets:
@@ -1665,7 +1665,7 @@ index 483e824a253..a62612d7681 100644
16651665
- path: build-resources.sh
16661666
name: Build Resources
16671667
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
16691669
--- a/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj
16701670
+++ b/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj
16711671
@@ -3,44 +3,157 @@
@@ -2068,7 +2068,7 @@ index 9d87ed5702f..a5edb9121c5 100644
20682068
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
20692069
SDKROOT = iphoneos;
20702070
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
20722072
--- a/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf Metal.xcscheme
20732073
+++ b/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf Metal.xcscheme
20742074
@@ -1,6 +1,6 @@
@@ -2080,7 +2080,7 @@ index 696c235f1b1..640ecf87e2e 100644
20802080
<BuildAction
20812081
parallelizeBuildables = "YES"
20822082
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
20842084
--- a/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf OpenGL.xcscheme
20852085
+++ b/ios/samples/hello-gltf/hello-gltf.xcodeproj/xcshareddata/xcschemes/hello-gltf OpenGL.xcscheme
20862086
@@ -1,6 +1,6 @@
@@ -2092,7 +2092,7 @@ index 5536b9ac726..d8c4b065764 100644
20922092
<BuildAction
20932093
parallelizeBuildables = "YES"
20942094
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
20962096
--- a/ios/samples/hello-gltf/project.yml
20972097
+++ b/ios/samples/hello-gltf/project.yml
20982098
@@ -10,10 +10,16 @@ targets:
@@ -2117,7 +2117,7 @@ index 377578053d3..adfa2896ed6 100644
21172117
- path: build-resources.sh
21182118
name: Build Resources
21192119
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
21212121
--- a/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj
21222122
+++ b/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj
21232123
@@ -3,43 +3,126 @@
@@ -2457,7 +2457,7 @@ index c80979f4f3c..169ddb84c10 100644
24572457
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
24582458
SDKROOT = iphoneos;
24592459
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
24612461
--- a/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr Metal.xcscheme
24622462
+++ b/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr Metal.xcscheme
24632463
@@ -1,6 +1,6 @@
@@ -2469,7 +2469,7 @@ index 545457ca8e3..93d88313fd9 100644
24692469
<BuildAction
24702470
parallelizeBuildables = "YES"
24712471
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
24732473
--- a/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr OpenGL.xcscheme
24742474
+++ b/ios/samples/hello-pbr/hello-pbr.xcodeproj/xcshareddata/xcschemes/hello-pbr OpenGL.xcscheme
24752475
@@ -1,6 +1,6 @@
@@ -2481,7 +2481,7 @@ index 0135777b7ec..96f3d5bab3e 100644
24812481
<BuildAction
24822482
parallelizeBuildables = "YES"
24832483
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
24852485
--- a/ios/samples/hello-pbr/project.yml
24862486
+++ b/ios/samples/hello-pbr/project.yml
24872487
@@ -6,9 +6,10 @@ targets:
@@ -2499,7 +2499,7 @@ index 36a6fd26a3e..f7daeac3e48 100644
24992499
- path: build-resources.sh
25002500
name: Build Resources
25012501
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
25032503
--- a/ios/samples/hello-triangle/hello-triangle.xcodeproj/project.pbxproj
25042504
+++ b/ios/samples/hello-triangle/hello-triangle.xcodeproj/project.pbxproj
25052505
@@ -3,35 +3,103 @@
@@ -2794,7 +2794,7 @@ index fbc8f752c75..6e99ba2c111 100644
27942794
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
27952795
SDKROOT = iphoneos;
27962796
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
27982798
--- a/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle Metal.xcscheme
27992799
+++ b/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle Metal.xcscheme
28002800
@@ -1,6 +1,6 @@
@@ -2806,7 +2806,7 @@ index 23e5ca4268e..d0463c46d2f 100644
28062806
<BuildAction
28072807
parallelizeBuildables = "YES"
28082808
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
28102810
--- a/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle OpenGL.xcscheme
28112811
+++ b/ios/samples/hello-triangle/hello-triangle.xcodeproj/xcshareddata/xcschemes/hello-triangle OpenGL.xcscheme
28122812
@@ -1,6 +1,6 @@
@@ -2818,7 +2818,7 @@ index 47405d4e237..94f0142df99 100644
28182818
<BuildAction
28192819
parallelizeBuildables = "YES"
28202820
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
28222822
--- a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/project.pbxproj
28232823
+++ b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/project.pbxproj
28242824
@@ -3,34 +3,102 @@
@@ -3114,7 +3114,7 @@ index 331fbf6b90c..9aa01d735d7 100644
31143114
SAMPLE_CODE_DISAMBIGUATOR = "${DEVELOPMENT_TEAM}";
31153115
SDKROOT = iphoneos;
31163116
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
31183118
--- a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering Metal.xcscheme
31193119
+++ b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering Metal.xcscheme
31203120
@@ -1,6 +1,6 @@
@@ -3126,7 +3126,7 @@ index 56fb8a1a6cb..ec840707f0d 100644
31263126
<BuildAction
31273127
parallelizeBuildables = "YES"
31283128
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
31303130
--- a/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering OpenGL.xcscheme
31313131
+++ b/ios/samples/transparent-rendering/transparent-rendering.xcodeproj/xcshareddata/xcschemes/transparent-rendering OpenGL.xcscheme
31323132
@@ -1,6 +1,6 @@
@@ -3138,7 +3138,7 @@ index 60f7cdd5c6e..2a670e47961 100644
31383138
<BuildAction
31393139
parallelizeBuildables = "YES"
31403140
diff --git a/third_party/clang/iOS.cmake b/third_party/clang/iOS.cmake
3141-
index a5619558834..6153cf8641e 100644
3141+
index e9ea75e7a..ae970bdca 100644
31423142
--- a/third_party/clang/iOS.cmake
31433143
+++ b/third_party/clang/iOS.cmake
31443144
@@ -103,7 +103,12 @@ IF (NOT DEFINED IOS_MIN_TARGET)
@@ -3155,4 +3155,3 @@ index a5619558834..6153cf8641e 100644
31553155

31563156
SET(CMAKE_C_FLAGS_INIT "${IOS_COMMON_FLAGS}")
31573157
SET(CMAKE_CXX_FLAGS_INIT "${IOS_COMMON_FLAGS}")
3158-

0 commit comments

Comments
 (0)