Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skybox now binds dummy texture.

Browse Source 
This fixes unbound sampler warnings, as seen in our hellotriangle app.
This commit is contained in:
Philip Rideout
2020-04-22 11:59:41 -07:00
parent 2e0e19d9ce
commit 0e2cf44ca4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
filament/src/Skybox.cpp
View File

@@ -102,9 +102,8 @@ FSkybox::FSkybox(FEngine& engine, const Builder& builder) noexcept
TextureSampler sampler(TextureSampler::MagFilter::LINEAR, TextureSampler::WrapMode::REPEAT);
auto pInstance = static_cast<MaterialInstance*>(mSkyboxMaterialInstance);
if (mSkyboxTexture != nullptr) {
pInstance->setParameter("skybox", mSkyboxTexture, sampler);
}
FTexture const* texture = mSkyboxTexture ? mSkyboxTexture : engine.getDummyCubemap();
pInstance->setParameter("skybox", texture, sampler);
pInstance->setParameter("showSun", builder->mShowSun);
pInstance->setParameter("constantColor", mSkyboxTexture == nullptr);
pInstance->setParameter("color", builder->mColor);

1
filament/src/details/Engine.h
View File

@@ -152,6 +152,7 @@ public:
const FMaterial* getDefaultMaterial() const noexcept { return mDefaultMaterial; }
const FMaterial* getSkyboxMaterial() const noexcept;
const FIndirectLight* getDefaultIndirectLight() const noexcept { return mDefaultIbl; }
const FTexture* getDummyCubemap() const noexcept { return mDefaultIblTexture; }
backend::Handle<backend::HwRenderPrimitive> getFullScreenRenderPrimitive() const noexcept {
return mFullScreenTriangleRph;