diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-10-19 22:06:43 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-10-19 22:06:43 +0000 |
| commit | 4a63243fcd1ea5bef513abf0fd26b73ef6e9c7dd (patch) | |
| tree | 6bf3630fd8eb9a4ae93fee66ed1691ed94ca2510 /Graphics/GraphicsEngineD3D11 | |
| parent | Vulkan backend: added a bunch of __forceinline's to improve performance (diff) | |
| download | DiligentCore-4a63243fcd1ea5bef513abf0fd26b73ef6e9c7dd.tar.gz DiligentCore-4a63243fcd1ea5bef513abf0fd26b73ef6e9c7dd.zip | |
Renamed EngineD3D11DebugFlags to D3D11_DEBUG_FLAGS (Updated API version to 240034)
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/readme.md | 3 | ||||
| -rwxr-xr-x | Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp | 28 |
2 files changed, 15 insertions, 16 deletions
diff --git a/Graphics/GraphicsEngineD3D11/readme.md b/Graphics/GraphicsEngineD3D11/readme.md index f0af4126..9afc1f81 100644 --- a/Graphics/GraphicsEngineD3D11/readme.md +++ b/Graphics/GraphicsEngineD3D11/readme.md @@ -15,8 +15,7 @@ using namespace Diligent; EngineD3D11CreateInfo EngineCI; EngineCI.DebugFlags = - (Uint32)EngineD3D11DebugFlags::VerifyCommittedShaderResources | - (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance; + D3D11_DEBUG_FLAG_VERIFY_COMMITTED_SHADER_RESOURCES; // Get pointer to the function that returns the factory #if ENGINE_DLL diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp index dd77731b..40be5457 100755 --- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp @@ -326,7 +326,7 @@ namespace Diligent }
#ifdef DEVELOPMENT
- if ((m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance) != 0 && ShaderTypeInd == CSInd)
+ if ((m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE) != 0 && ShaderTypeInd == CSInd)
{
dbgVerifyCommittedUAVs(pShaderD3D11->GetDesc().ShaderType);
}
@@ -436,7 +436,7 @@ namespace Diligent m_NumCommittedCBs[ShaderTypeInd] = std::max(m_NumCommittedCBs[ShaderTypeInd], static_cast<Uint8>(NumCBs));
}
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
dbgVerifyCommittedCBs(pShaderD3D11->GetDesc().ShaderType);
}
@@ -543,7 +543,7 @@ namespace Diligent m_NumCommittedSRVs[ShaderTypeInd] = std::max(m_NumCommittedSRVs[ShaderTypeInd], static_cast<Uint8>(NumSRVs));
}
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
dbgVerifyCommittedSRVs(pShaderD3D11->GetDesc().ShaderType);
}
@@ -583,7 +583,7 @@ namespace Diligent m_NumCommittedSamplers[ShaderTypeInd] = std::max(m_NumCommittedSamplers[ShaderTypeInd], static_cast<Uint8>(NumSamplers));
}
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
dbgVerifyCommittedSamplers(pShaderD3D11->GetDesc().ShaderType);
}
@@ -594,7 +594,7 @@ namespace Diligent #ifdef DEVELOPMENT
- if (CommitResources && (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedShaderResources) != 0)
+ if (CommitResources && (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_SHADER_RESOURCES) != 0)
{
// Use full resource layout to verify that all required resources are committed
pShaderD3D11->GetD3D11Resources()->dvpVerifyCommittedResources(
@@ -768,7 +768,7 @@ namespace Diligent }
}
- if(m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if(m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
// Verify bindings after all resources are set
dbgVerifyCommittedSRVs();
@@ -863,7 +863,7 @@ namespace Diligent return;
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
// Verify bindings
dbgVerifyCommittedSRVs();
@@ -883,7 +883,7 @@ namespace Diligent return;
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
// Verify bindings
dbgVerifyCommittedSRVs();
@@ -1469,7 +1469,7 @@ namespace Diligent m_pd3d11DeviceContext->IASetIndexBuffer( nullptr, DXGI_FORMAT_R32_UINT, m_CommittedD3D11IndexDataStartOffset );
}
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
dbgVerifyCommittedIndexBuffer();
}
@@ -1497,7 +1497,7 @@ namespace Diligent }
}
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
dbgVerifyCommittedVertexBuffers();
}
@@ -1523,7 +1523,7 @@ namespace Diligent }
}
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
dbgVerifyCommittedCBs();
}
@@ -1703,7 +1703,7 @@ namespace Diligent }
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
dbgVerifyCommittedSRVs();
dbgVerifyCommittedUAVs(SHADER_TYPE_COMPUTE);
@@ -1737,7 +1737,7 @@ namespace Diligent InvalidateState();
#ifdef DEVELOPMENT
- if (m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if (m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
// Verify bindings
dbgVerifyCommittedSRVs();
@@ -1774,7 +1774,7 @@ namespace Diligent InvalidateState();
#ifdef DEVELOPMENT
- if(m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)
+ if(m_DebugFlags & D3D11_DEBUG_FLAG_VERIFY_COMMITTED_RESOURCE_RELEVANCE)
{
// Verify bindings
dbgVerifyCommittedSRVs();
|