Merge pull request #1500 from HifiExperiments/samplerAssert

fix sampler assert

Author: ksuprynowicz

libraries/gpu-gl-common/src/gpu/gl/GLBackendPipeline.cpp

@@ -245,10 +245,7 @@ void GLBackend::do_setResourceTexture(const Batch& batch, size_t paramOffset) {
     }
 
     const auto& resourceTexture = batch._textures.get(batch._params[paramOffset + 0]._uint);
-    Sampler sampler;
-    if (resourceTexture) {
-        sampler = batch._samplers.get(batch._params[paramOffset + 2]._uint);
-    }
+    const Sampler& sampler = batch._samplers.get(batch._params[paramOffset + 2]._uint);
     bindResourceTexture(slot, resourceTexture, sampler);
 }
 
@@ -278,9 +275,10 @@ void GLBackend::do_setResourceFramebufferSwapChainTexture(const Batch& batch, si
     }
     auto index = batch._params[paramOffset + 2]._uint;
     auto renderBufferSlot = batch._params[paramOffset + 3]._uint;
+    const Sampler& sampler = batch._samplers.get(batch._params[paramOffset + 4]._uint);
+
     const auto& resourceFramebuffer = swapChain->get(index);
     const auto& resourceTexture = resourceFramebuffer->getRenderBuffer(renderBufferSlot);
-    Sampler sampler = batch._samplers.get(batch._params[paramOffset + 4]._uint);
     setResourceTexture(slot, resourceTexture, sampler);
 }
 
@@ -325,11 +323,7 @@ void GLBackend::do_setResourceTextureTable(const Batch& batch, size_t paramOffse
     const auto& textures = textureTable.getTextures();
     for (GLuint slot = 0; slot < textures.size(); ++slot) {
         const auto& texture = textures[slot];
-
-        Sampler sampler;
-        if (texture) {
-            sampler = batch._samplers.get(batch._params[paramOffset + 2 + (samplerIndex++)]._uint);
-        }
+        const Sampler& sampler = batch._samplers.get(batch._params[paramOffset + 2 + (samplerIndex++)]._uint);
 
         bindResourceTexture(slot + startSlot, texture, sampler);
     }

libraries/gpu/src/gpu/Batch.cpp

@@ -387,9 +387,7 @@ void Batch::setResourceTexture(uint32 slot, const TexturePointer& texture) {
 
     _params.emplace_back(_textures.cache(texture));
     _params.emplace_back(slot);
-    if (texture) {
-        _params.emplace_back(_samplers.cache(texture->getSampler()));
-    }
+    _params.emplace_back(_samplers.cache(texture ? texture->getSampler() : Sampler()));
 }
 
 void Batch::setResourceTexture(uint32 slot, const TextureView& view) {
@@ -403,9 +401,7 @@ void Batch::setResourceTextureTable(const TextureTablePointer& textureTable, uin
     if (textureTable) {
         TextureTable::Array textures = textureTable->getTextures();
         for (auto& texture : textures) {
-            if (texture) {
-                _params.emplace_back(_samplers.cache(texture->getSampler()));
-            }
+            _params.emplace_back(_samplers.cache(texture ? texture->getSampler() : Sampler()));
         }
     }
 }
@@ -421,6 +417,8 @@ void Batch::setResourceFramebufferSwapChainTexture(uint32 slot, const Framebuffe
         const auto& resourceFramebuffer = framebuffer->get(swapChainIndex);
         const auto& resourceTexture = resourceFramebuffer->getRenderBuffer(renderBufferSlot);
         _params.emplace_back(_samplers.cache(resourceTexture->getSampler()));
+    } else {
+        _params.emplace_back(_samplers.cache(Sampler()));
     }
 }