Skip to content

Commit adee213

Browse files
committed
Address PR Comments
2 parents fe5d494 + 361ba2a commit adee213

File tree

173 files changed

+4397
-2001
lines changed

Some content is hidden

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

173 files changed

+4397
-2001
lines changed

.github/actions/dep-versions/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ runs:
33
using: "composite"
44
steps:
55
- name: Set up dependency versions
6-
shell: bash
6+
shell: bash
77
run: cat ./build/common/versions >> $GITHUB_ENV

.github/actions/web-prereq/action.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: 'Web Preqrequisites'
2+
runs:
3+
using: "composite"
4+
steps:
5+
- uses: ./.github/actions/dep-versions
6+
- name: Cache EMSDK
7+
id: emsdk-cache
8+
uses: actions/cache@v4 # Use a specific version
9+
with:
10+
path: emsdk
11+
key: ${{ runner.os }}-emsdk-${{ env.GITHUB_EMSDK_VERSION }}
12+
- name: Install Web Prerequisites
13+
shell: bash
14+
run: |
15+
bash ./build/common/get-emscripten.sh
16+
echo "EMSDK=$PWD/emsdk" >> $GITHUB_ENV

.github/workflows/mac-continuous.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
path: out/filament-release-darwin.tgz
2727
- name: Check public headers
2828
run: |
29-
build/common/check-headers.sh out/release/filament/include
29+
test/check-headers/test.sh out/release/filament/include

.github/workflows/presubmit.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ jobs:
9696
with:
9797
fetch-depth: 0
9898
- uses: ./.github/actions/linux-prereq
99+
- uses: ./.github/actions/web-prereq
99100
- name: Run build script
100101
run: |
101102
cd build/web && printf "y" | ./build.sh presubmit
@@ -123,13 +124,15 @@ jobs:
123124
- uses: ./.github/actions/mac-prereq
124125
- name: Cache Mesa and deps
125126
id: mesa-cache
126-
uses: actions/cache@v4 # Use a specific version
127+
uses: actions/cache@v4
127128
with:
128129
path: mesa
129130
key: ${{ runner.os }}-mesa-deps-2-${{ vars.MESA_VERSION }}
130-
- name: Get Mesa
131-
id: mesa-prereq
132-
run: bash test/utils/get_mesa.sh
131+
- name: Prerequisites
132+
id: prereqs
133+
run: |
134+
bash build/common/get-mesa.sh
135+
pip install tifffile numpy
133136
- name: Run Test
134137
run: bash test/renderdiff/test.sh
135138
- uses: actions/upload-artifact@v4
@@ -150,8 +153,8 @@ jobs:
150153
- name: Run test
151154
run: ./out/cmake-debug/libs/filamat/test_filamat --gtest_filter=MaterialCompiler.Wgsl*
152155

153-
code-correcteness:
154-
name: code-correctness
156+
test-code-correctness:
157+
name: test-code-correctness
155158
runs-on: 'macos-14-xlarge'
156159
steps:
157160
- uses: actions/checkout@v4.1.6

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,9 @@ jobs:
6565
6666
build-mac:
6767
name: build-mac
68-
runs-on: ${{ matrix.os }}
68+
runs-on: macos-14-xlarge
6969
if: github.event_name == 'release' || github.event.inputs.platform == 'desktop'
7070

71-
strategy:
72-
matrix:
73-
os: [macos-14-xlarge, ubuntu-22.04-32core]
74-
7571
steps:
7672
- name: Decide Git ref
7773
id: git_ref
@@ -118,6 +114,7 @@ jobs:
118114
with:
119115
ref: ${{ steps.git_ref.outputs.ref }}
120116
- uses: ./.github/actions/linux-prereq
117+
- uses: ./.github/actions/web-prereq
121118
- name: Run build script
122119
env:
123120
TAG: ${{ steps.git_ref.outputs.tag }}
@@ -166,6 +163,9 @@ jobs:
166163
mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar
167164
mv out/gltfio-android-release.aar out/gltfio-${TAG}-android.aar
168165
mv out/filament-utils-android-release.aar out/filament-utils-${TAG}-android.aar
166+
cd out/android-release/filament
167+
tar -czf ../../filament-${TAG}-android-native.tgz .
168+
cd ../../..
169169
- name: Sign sample-gltf-viewer
170170
run: |
171171
echo "${APK_KEYSTORE_BASE64}" > filament.jks.base64
@@ -187,7 +187,7 @@ jobs:
187187
script: |
188188
const upload = require('./build/common/upload-release-assets');
189189
const { TAG } = process.env;
190-
const globber = await glob.create(['out/*.aar', 'out/*.apk'].join('\n'));
190+
const globber = await glob.create(['out/*.aar', 'out/*.apk', 'out/*.tgz'].join('\n'));
191191
await upload({ github, context }, await globber.glob(), TAG);
192192
193193
build-ios:

.github/workflows/web-continuous.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 0
1919
- uses: ./.github/actions/linux-prereq
20+
- uses: ./.github/actions/web-prereq
2021
- name: Run build script
2122
run: |
2223
cd build/web && printf "y" | ./build.sh continuous

BUILDING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,8 @@ python ./emsdk.py activate latest
363363
source ./emsdk_env.sh
364364
```
365365

366+
Alternatively, you can try running the script `build/common/get-emscripten.sh`.
367+
366368
After this you can invoke the [easy build](#easy-build) script as follows:
367369

368370
```shell

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.59.3'
34+
implementation 'com.google.android.filament:filament-android:1.60.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.59.3'
54+
pod 'Filament', '~> 1.60.0'
5555
```
5656

5757
## Documentation

RELEASE_NOTES.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ 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.60.1
11+
12+
13+
## v1.60.0
14+
15+
- materials: remove dependence on per-view descset layout from filamat. [⚠️ **New Material Version**]
16+
- matc non-functional change: Update GLSL postprocessor to
17+
isolate calls to SPVRemap from calls to SPIRV-Cross.
18+
19+
20+
## v1.59.5
21+
22+
1023
## v1.59.4
1124

1225

android/filament-android/src/main/java/com/google/android/filament/View.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ public enum JitterPattern {
19801980
}
19811981

19821982
/**
1983-
* reconstruction filter width typically between 0.2 (sharper, aliased) and 1.5 (smoother)
1983+
* reconstruction filter width typically between 1 (sharper) and 2 (smoother)
19841984
*/
19851985
public float filterWidth = 1.0f;
19861986
/**

0 commit comments

Comments
 (0)