From 0e2cf44ca4fa6e30d2c7582f30dd1c5700d145bb Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Wed, 22 Apr 2020 11:59:41 -0700 Subject: [PATCH] Skybox now binds dummy texture. This fixes unbound sampler warnings, as seen in our hellotriangle app. --- filament/src/Skybox.cpp | 5 ++--- filament/src/details/Engine.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/filament/src/Skybox.cpp b/filament/src/Skybox.cpp index 21a2832a7c..3da96519c6 100644 --- a/filament/src/Skybox.cpp +++ b/filament/src/Skybox.cpp @@ -102,9 +102,8 @@ FSkybox::FSkybox(FEngine& engine, const Builder& builder) noexcept TextureSampler sampler(TextureSampler::MagFilter::LINEAR, TextureSampler::WrapMode::REPEAT); auto pInstance = static_cast(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); diff --git a/filament/src/details/Engine.h b/filament/src/details/Engine.h index 4613cb0a92..0dcba3ab6c 100644 --- a/filament/src/details/Engine.h +++ b/filament/src/details/Engine.h @@ -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 getFullScreenRenderPrimitive() const noexcept { return mFullScreenTriangleRph;