Skip to content

Commit 2971fd3

Browse files
author
Daisuke Kasuga
committed
change initializeSettings func signature
1 parent f4d08b0 commit 2971fd3

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

filament/src/details/ColorGrading.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ FColorGrading::FColorGrading(FEngine& engine, const Builder& builder) {
987987
});
988988

989989
// Initialize settings from builder
990-
initializeSettings(mSettings, builder);
990+
initializeSettings(builder, mSettings);
991991
}
992992

993993
FColorGrading::~FColorGrading() noexcept = default;
@@ -997,7 +997,7 @@ void FColorGrading::terminate(FEngine& engine) {
997997
driver.destroyTexture(mLutHandle);
998998
}
999999

1000-
void FColorGrading::initializeSettings(Settings& settings, const Builder& builder) noexcept {
1000+
void FColorGrading::initializeSettings(const Builder& builder, Settings& settings) noexcept {
10011001
settings.lutFormat = builder->format;
10021002
settings.lutDimensions = builder->dimension;
10031003
settings.toneMapper = builder->toneMapper;

filament/src/details/ColorGrading.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,12 @@ class FColorGrading : public ColorGrading {
4646
bool isOneDimensional() const noexcept { return mIsOneDimensional; }
4747
bool isLDR() const noexcept { return mIsLDR; }
4848

49+
static void initializeSettings(const Builder& builder, Settings& settings) noexcept;
4950
private:
5051
backend::TextureHandle mLutHandle;
5152
uint32_t mDimension;
5253
bool mIsOneDimensional;
5354
bool mIsLDR;
54-
55-
void initializeSettings(Settings& settings, const Builder& builder) noexcept;
5655
};
5756

5857
FILAMENT_DOWNCAST(ColorGrading)

0 commit comments

Comments
 (0)