Skip to content

Commit 963fc9b

Browse files
committed
Merge branch 'rc/1.59.3' into release
2 parents c4f0798 + 99c8211 commit 963fc9b

36 files changed

+1012
-493
lines changed

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

5757
## Documentation

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.59.3
11+
12+
1013
## v1.59.2
1114

1215
- Fix build/compile errors when upgrading to MacOS 15.4

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.59.2
2+
VERSION_NAME=1.59.3
33

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

filament/backend/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,10 @@ if (APPLE OR LINUX)
507507
test/Arguments.cpp
508508
test/ImageExpectations.cpp
509509
test/Lifetimes.cpp
510+
test/PlatformRunner.cpp
510511
test/Shader.cpp
511512
test/SharedShaders.cpp
513+
test/Skip.cpp
512514
test/test_FeedbackLoops.cpp
513515
test/test_Blit.cpp
514516
test/test_MissingRequiredAttributes.cpp

filament/backend/include/backend/BufferObjectStreamDescriptor.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ class UTILS_PUBLIC BufferObjectStreamDescriptor {
5555

5656
} // namespace filament::backend
5757

58+
#if !defined(NDEBUG)
59+
utils::io::ostream& operator<<(utils::io::ostream& out,
60+
const filament::backend::BufferObjectStreamDescriptor& b);
61+
#endif
62+
5863
#endif // TNT_FILAMENT_BACKEND_BUFFEROBJECTSTREAMDESCRIPTOR_H

filament/backend/include/backend/platforms/WebGPUPlatform.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ class WebGPUPlatform final : public Platform {
3838

3939
[[nodiscard]] wgpu::Instance& getInstance() noexcept { return mInstance; }
4040

41+
// TODO consider that this functionality is not WebGPU-specific, and thus could be
42+
// placed in a generic place and even reused across backends. Alternatively,
43+
// a 3rd party library could be considered. However, this was a simple and
44+
// quick change and works for now.
45+
// gets the size (height and width) of the surface/window
46+
[[nodiscard]] wgpu::Extent2D getSurfaceExtent(void* nativeWindow) const;
4147
// either returns a valid surface or panics
4248
[[nodiscard]] wgpu::Surface createSurface(void* nativeWindow, uint64_t flags);
4349
// either returns a valid adapter or panics

0 commit comments

Comments
 (0)