Skip to content

Commit 3f5965e

Browse files
committed
Merge branch 'rc/1.62.0' into release
2 parents 0f5351b + cb99449 commit 3f5965e

File tree

91 files changed

+2880
-906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+2880
-906
lines changed

.github/workflows/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
- uses: actions/upload-artifact@v4
139139
with:
140140
name: presubmit-renderdiff-result
141-
path: ./out/renderdiff_tests
141+
path: ./out/renderdiff
142142

143143
validate-wgsl-webgpu:
144144
name: validate-wgsl-webgpu

NEW_RELEASE_NOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ We are chaning the way Vulkan buffers are handled. We need to switch over to a m
66
**If you are cherry-picking a commit into an rc/ branch**: add the release note under the
77
appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
88

9-
## Release notes for next branch cut
9+
## Release notes for next branch cut

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ repositories {
3131
}
3232
3333
dependencies {
34-
implementation 'com.google.android.filament:filament-android:1.61.2'
34+
implementation 'com.google.android.filament:filament-android:1.62.0'
3535
}
3636
```
3737

@@ -51,7 +51,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
5151
iOS projects can use CocoaPods to install the latest release:
5252

5353
```shell
54-
pod 'Filament', '~> 1.61.2'
54+
pod 'Filament', '~> 1.62.0'
5555
```
5656

5757
## Documentation

RELEASE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ A new header is inserted each time a *tag* is created.
77
Instead, if you are authoring a PR for the main branch, add your release note to
88
[NEW_RELEASE_NOTES.md](./NEW_RELEASE_NOTES.md).
99

10+
## v1.62.0
11+
12+
- Add new `unfilterable` field to Filament Material's `sampler` [⚠️ **New Material Version**]
13+
1014
## v1.61.2
1115

1216
- samples: samples now have a CLI to select backend api

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GROUP=com.google.android.filament
2-
VERSION_NAME=1.61.2
2+
VERSION_NAME=1.62.0
33

44
POM_DESCRIPTION=Real-time physically based rendering engine for Android.
55

-15.4 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Nov 17 10:40:18 PST 2021
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)