summaryrefslogtreecommitdiffstats
path: root/Graphics
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-11-24 17:12:26 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-11-24 17:12:26 +0000
commitfb64625eabe0e39fe12029fcdc8397063e50115f (patch)
treedf1cad084f68ead1304b5cdd7f3fd666823e2709 /Graphics
parentImproved reporting of resource binding problems in InitializeStaticResources() (diff)
downloadDiligentCore-fb64625eabe0e39fe12029fcdc8397063e50115f.tar.gz
DiligentCore-fb64625eabe0e39fe12029fcdc8397063e50115f.zip
Some minor updates to formatting of debug messages
Diffstat (limited to 'Graphics')
-rw-r--r--Graphics/GLSLTools/src/SPIRVShaderResources.cpp4
-rw-r--r--Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp6
-rw-r--r--Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp6
-rw-r--r--Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.h2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp6
5 files changed, 12 insertions, 12 deletions
diff --git a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp
index fc881893..6ff18255 100644
--- a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp
+++ b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp
@@ -457,7 +457,7 @@ SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator& Allocator,
}
if (!VariableFound)
{
- LOG_WARNING_MESSAGE("Variable '", VarName, "' labeled as ", GetShaderVariableTypeLiteralName(VarType), " not found in shader '", shaderDesc.Name, "'");
+ LOG_WARNING_MESSAGE("Variable '", VarName, "' labeled as ", GetShaderVariableTypeLiteralName(VarType), " is not found in shader '", shaderDesc.Name, "'");
}
}
}
@@ -495,7 +495,7 @@ SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator& Allocator,
if (!SamplerFound)
{
- LOG_WARNING_MESSAGE("Static sampler '", SamName, "' not found in shader '", shaderDesc.Name, "'");
+ LOG_WARNING_MESSAGE("Static sampler '", SamName, "' is not found in shader '", shaderDesc.Name, "'");
}
}
}
diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp
index ee5b9ec9..14784dd2 100644
--- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp
@@ -139,10 +139,10 @@ void ShaderResourceBindingD3D11Impl::InitializeStaticResources(const IPipelineSt
#ifdef DEVELOPMENT
if (!pShaderD3D11->GetStaticResourceLayout().dvpVerifyBindings())
{
- LOG_ERROR_MESSAGE("Static resources in a SRB of PSO '", pPSOD3D11->GetDesc().Name, "' will not be successfully initialized "
+ LOG_ERROR_MESSAGE("Static resources in SRB of PSO '", pPSOD3D11->GetDesc().Name, "' will not be successfully initialized "
"because not all static resource bindings in shader '", pShaderD3D11->GetDesc().Name, "' are valid. "
- "Please make sure you bind all static resources to the shader before calling InitializeStaticResources() or "
- "before creating a SRB via CreateShaderResourceBinding() method with InitStaticResources=true.");
+ "Please make sure you bind all static resources to the shader before calling InitializeStaticResources() "
+ "directly or indirectly by passing InitStaticResources=true to CreateShaderResourceBinding() method.");
}
#endif
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
index 8296f230..ca2e161c 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
@@ -181,10 +181,10 @@ void ShaderResourceBindingD3D12Impl::InitializeStaticResources(const IPipelineSt
#ifdef DEVELOPMENT
if (!pShader->DvpVerifyStaticResourceBindings())
{
- LOG_ERROR_MESSAGE("Static resources in a SRB of PSO '", pPSO12->GetDesc().Name, "' will not be successfully initialized "
+ LOG_ERROR_MESSAGE("Static resources in SRB of PSO '", pPSO12->GetDesc().Name, "' will not be successfully initialized "
"because not all static resource bindings in shader '", pShader->GetDesc().Name, "' are valid. "
- "Please make sure you bind all static resources to the shader before calling InitializeStaticResources() or "
- "before creating a SRB via CreateShaderResourceBinding() method with InitStaticResources=true.");
+ "Please make sure you bind all static resources to the shader before calling InitializeStaticResources() "
+ "directly or indirectly by passing InitStaticResources=true to CreateShaderResourceBinding() method.");
}
#endif
const auto& ShaderResLayout = pPSO12->GetShaderResLayout(s);
diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.h b/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.h
index 346917ea..992206cd 100644
--- a/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.h
+++ b/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.h
@@ -232,7 +232,7 @@ namespace Diligent
}
if(!VariableFound)
{
- LOG_WARNING_MESSAGE("Variable \"", VarName, "\" not found in shader \"", ShdrDesc.Name, '\"');
+ LOG_WARNING_MESSAGE("Variable '", VarName, "' is not found in shader '", ShdrDesc.Name, '\'');
}
}
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
index c4c899b5..9676ee4f 100644
--- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
@@ -161,10 +161,10 @@ void ShaderResourceBindingVkImpl::InitializeStaticResources(const IPipelineState
#ifdef DEVELOPMENT
if (!pShaderVk->DvpVerifyStaticResourceBindings())
{
- LOG_ERROR_MESSAGE("Static resources in a SRB of PSO '", pPSOVK->GetDesc().Name, "' will not be successfully initialized "
+ LOG_ERROR_MESSAGE("Static resources in SRB of PSO '", pPSOVK->GetDesc().Name, "' will not be successfully initialized "
"because not all static resource bindings in shader '", pShaderVk->GetDesc().Name, "' are valid. "
- "Please make sure you bind all static resources to the shader before calling InitializeStaticResources() or "
- "before creating a SRB via CreateShaderResourceBinding() method with InitStaticResources=true.");
+ "Please make sure you bind all static resources to the shader before calling InitializeStaticResources() "
+ "directly or indirectly by passing InitStaticResources=true to CreateShaderResourceBinding() method.");
}
#endif
const auto& StaticResLayout = pShaderVk->GetStaticResLayout();