summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineVulkan
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-12-05 16:26:06 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-12-05 16:26:06 +0000
commitafbab2b5335815aac5507d564a747d32f5ae31be (patch)
tree467b972a596310090227e18edb1d8268bf30210b /Graphics/GraphicsEngineVulkan
parentAdded ITextureD3D12::GetD3D12ResourceState(), IBufferD3D12::GetD3D12ResourceS... (diff)
downloadDiligentCore-afbab2b5335815aac5507d564a747d32f5ae31be.tar.gz
DiligentCore-afbab2b5335815aac5507d564a747d32f5ae31be.zip
Minor code improvements
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
-rw-r--r--Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp5
-rw-r--r--Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp2
2 files changed, 5 insertions, 2 deletions
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<TextureVkImpl>();
+ 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();