From cc29359897159ce9aec419a8cd6ac955cd4e1cc3 Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Wed, 6 May 2020 15:19:54 -0700 Subject: [PATCH] gltfio: fix unbound texture warnings in ubershader mode. --- libs/gltfio/src/UbershaderLoader.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libs/gltfio/src/UbershaderLoader.cpp b/libs/gltfio/src/UbershaderLoader.cpp index 945b8dcfb2..bc65a32249 100644 --- a/libs/gltfio/src/UbershaderLoader.cpp +++ b/libs/gltfio/src/UbershaderLoader.cpp @@ -82,7 +82,6 @@ public: #define MATINDEX(shading, alpha) (int(shading) + 3 * int(alpha)) UbershaderLoader::UbershaderLoader(Engine* engine) : mEngine(engine) { - #ifdef EMSCRIPTEN unsigned char texels[4] = {}; mDummyTexture = Texture::Builder() .width(1).height(1) @@ -91,7 +90,6 @@ UbershaderLoader::UbershaderLoader(Engine* engine) : mEngine(engine) { Texture::PixelBufferDescriptor pbd(texels, sizeof(texels), Texture::Format::RGBA, Texture::Type::UBYTE); mDummyTexture->setImage(*mEngine, 0, std::move(pbd)); - #endif } size_t UbershaderLoader::getMaterialsCount() const noexcept { @@ -179,11 +177,6 @@ MaterialInstance* UbershaderLoader::createMaterialInstance(MaterialKey* config, mi->setParameter("clearCoatNormalUvMatrix", identity); #endif - // Some WebGL implementations emit a warning at draw call time if the shader declares a sampler - // that has not been bound to a texture, even if the texture lookup is conditional. Therefore we - // need to ensure that every sampler parameter is bound to a dummy texture, even if it is never - // actually sampled from. - #ifdef EMSCRIPTEN TextureSampler sampler; mi->setParameter("normalMap", mDummyTexture, sampler); mi->setParameter("baseColorMap", mDummyTexture, sampler); @@ -193,7 +186,6 @@ MaterialInstance* UbershaderLoader::createMaterialInstance(MaterialKey* config, mi->setParameter("clearCoatMap", mDummyTexture, sampler); mi->setParameter("clearCoatRoughnessMap", mDummyTexture, sampler); mi->setParameter("clearCoatNormalMap", mDummyTexture, sampler); - #endif return mi; }