From afbab2b5335815aac5507d564a747d32f5ae31be Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Wed, 5 Dec 2018 08:26:06 -0800 Subject: Minor code improvements --- Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp | 5 +++-- Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp index feebec7b..4e575fa6 100644 --- a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp +++ b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp @@ -198,13 +198,14 @@ namespace Diligent void GenerateMipsVkHelper::GenerateMips(TextureViewVkImpl& TexView, DeviceContextVkImpl& Ctx, IShaderResourceBinding& SRB) { auto* pTexVk = TexView.GetTexture(); + const auto& TexDesc = pTexVk->GetDesc(); + if (!pTexVk->IsInKnownState()) { - LOG_ERROR_MESSAGE("Unable to generate mips for texture '", pTexVk->GetDesc().Name, "' because texture state is unknown"); + LOG_ERROR_MESSAGE("Unable to generate mips for texture '", TexDesc.Name, "' because the texture state is unknown"); return; } - const auto& TexDesc = pTexVk->GetDesc(); const auto& ViewDesc = TexView.GetDesc(); auto* pSrcMipVar = SRB.GetVariable(SHADER_TYPE_COMPUTE, "SrcMip"); auto* pOutMipVar = SRB.GetVariable(SHADER_TYPE_COMPUTE, "OutMip"); diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp index a9cc05f3..eeee5058 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp @@ -320,10 +320,12 @@ VkDescriptorImageInfo ShaderResourceCacheVk::Resource::GetImageDescriptorWriteIn // object (13.2.4) DescrImgInfo.sampler = pSamplerVk->GetVkSampler(); } +#ifdef DEVELOPMENT else { LOG_ERROR_MESSAGE("No sampler assigned to texture view '", pTexViewVk->GetDesc().Name, "'"); } +#endif } DescrImgInfo.imageView = pTexViewVk->GetVulkanImageView(); -- cgit v1.2.3