Skip to content

Commit 80ef2ed

Browse files
committed
Merge branch 'rc/1.63.1' into release
2 parents f384f50 + 93ad78a commit 80ef2ed

File tree

93 files changed

+2440
-1650
lines changed

Some content is hidden

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

93 files changed

+2440
-1650
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ project(TNT)
2222
option(FILAMENT_USE_EXTERNAL_GLES3 "Experimental: Compile Filament against OpenGL ES 3" OFF)
2323

2424
option(FILAMENT_ENABLE_LTO "Enable link-time optimizations if supported by the compiler" OFF)
25-
2625
option(FILAMENT_SKIP_SAMPLES "Don't build samples" OFF)
2726

2827
option(FILAMENT_SUPPORTS_XCB "Include XCB support in Linux builds" ON)
@@ -871,6 +870,7 @@ if (IS_HOST_PLATFORM)
871870
add_subdirectory(${LIBRARIES}/filamentapp)
872871
endif()
873872
add_subdirectory(${LIBRARIES}/imageio)
873+
add_subdirectory(${LIBRARIES}/filament-matp)
874874

875875
add_subdirectory(${FILAMENT}/samples)
876876

README.md

Lines changed: 3 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.63.0'
34+
implementation 'com.google.android.filament:filament-android:1.63.1'
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.63.0'
54+
pod 'Filament', '~> 1.63.1'
5555
```
5656

5757
## Documentation
@@ -331,6 +331,7 @@ and tools.
331331
- `filamesh`: Mesh converter
332332
- `glslminifier`: Minifies GLSL source code
333333
- `matc`: Material compiler
334+
- `filament-matp`: Material parser
334335
- `matinfo` Displays information about materials compiled with `matc`
335336
- `mipgen` Generates a series of miplevels from a source image
336337
- `normal-blending`: Tool to blend normal maps

RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ 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.63.1
11+
12+
1013
## v1.63.0
1114

1215
- Rename `sampler` parameter `unfilterable` to `filterable` [⚠️ **New Material Version**]

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.63.0
2+
VERSION_NAME=1.63.1
33

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

build/common/test_list.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ libs/math/test_math
55
libs/image/test_image compare libs/image/tests/reference/
66
libs/utils/test_utils
77
libs/filamat/test_filamat
8-
tools/matc/test_matc
8+
libs/filament-matp/test_matp
99
tools/cmgen/test_cmgen compare
1010
tools/glslminifier/test_glslminifier
1111
libs/filameshio/test_filameshio

docs/dup/intro.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ <h3 id="android"><a class="header" href="#android">Android</a></h3>
181181
}
182182

183183
dependencies {
184-
implementation 'com.google.android.filament:filament-android:1.62.1'
184+
implementation 'com.google.android.filament:filament-android:1.62.2'
185185
}
186186
</code></pre>
187187
<p>Here are all the libraries available in the group <code>com.google.android.filament</code>:</p>
@@ -196,7 +196,7 @@ <h3 id="android"><a class="header" href="#android">Android</a></h3>
196196
</div>
197197
<h3 id="ios"><a class="header" href="#ios">iOS</a></h3>
198198
<p>iOS projects can use CocoaPods to install the latest release:</p>
199-
<pre><code class="language-shell">pod 'Filament', '~&gt; 1.62.1'
199+
<pre><code class="language-shell">pod 'Filament', '~&gt; 1.62.2'
200200
</code></pre>
201201
<h2 id="documentation"><a class="header" href="#documentation">Documentation</a></h2>
202202
<ul>

docs/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ <h3 id="android"><a class="header" href="#android">Android</a></h3>
181181
}
182182

183183
dependencies {
184-
implementation 'com.google.android.filament:filament-android:1.62.1'
184+
implementation 'com.google.android.filament:filament-android:1.62.2'
185185
}
186186
</code></pre>
187187
<p>Here are all the libraries available in the group <code>com.google.android.filament</code>:</p>
@@ -196,7 +196,7 @@ <h3 id="android"><a class="header" href="#android">Android</a></h3>
196196
</div>
197197
<h3 id="ios"><a class="header" href="#ios">iOS</a></h3>
198198
<p>iOS projects can use CocoaPods to install the latest release:</p>
199-
<pre><code class="language-shell">pod 'Filament', '~&gt; 1.62.1'
199+
<pre><code class="language-shell">pod 'Filament', '~&gt; 1.62.2'
200200
</code></pre>
201201
<h2 id="documentation"><a class="header" href="#documentation">Documentation</a></h2>
202202
<ul>

docs/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/searchindex.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

filament/backend/src/webgpu/WebGPUBlitter.cpp

Lines changed: 237 additions & 107 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)