This commit is contained in:
Branimir Karadžić 2015-08-11 23:04:35 -07:00
parent 1bcfb68f4f
commit 737652be61

View file

@ -696,6 +696,7 @@ namespace bgfx { namespace d3d12
D3D12_MESSAGE_CATEGORY catlist[] = D3D12_MESSAGE_CATEGORY catlist[] =
{ {
D3D12_MESSAGE_CATEGORY_STATE_CREATION, D3D12_MESSAGE_CATEGORY_STATE_CREATION,
D3D12_MESSAGE_CATEGORY_EXECUTION,
}; };
filter.DenyList.NumCategories = BX_COUNTOF(catlist); filter.DenyList.NumCategories = BX_COUNTOF(catlist);
filter.DenyList.pCategoryList = catlist; filter.DenyList.pCategoryList = catlist;
@ -1923,7 +1924,7 @@ data.NumQualityLevels = 0;
static void patchCb0(DxbcInstruction& _instruction, void* _userData) static void patchCb0(DxbcInstruction& _instruction, void* _userData)
{ {
union { void* ptr; uint32_t offset; } cast ={ _userData }; union { void* ptr; uint32_t offset; } cast = { _userData };
for (uint32_t ii = 0; ii < _instruction.numOperands; ++ii) for (uint32_t ii = 0; ii < _instruction.numOperands; ++ii)
{ {
@ -4070,6 +4071,8 @@ data.NumQualityLevels = 0;
} }
} }
if (srvHandle[0].ptr != 0)
{
uint16_t samplerStateIdx = getSamplerState(samplerFlags); uint16_t samplerStateIdx = getSamplerState(samplerFlags);
if (samplerStateIdx != currentSamplerStateIdx) if (samplerStateIdx != currentSamplerStateIdx)
{ {
@ -4077,8 +4080,6 @@ data.NumQualityLevels = 0;
m_commandList->SetGraphicsRootDescriptorTable(Rdt::Sampler, m_samplerAllocator.get(samplerStateIdx) ); m_commandList->SetGraphicsRootDescriptorTable(Rdt::Sampler, m_samplerAllocator.get(samplerStateIdx) );
} }
if (srvHandle[0].ptr != 0)
{
m_commandList->SetGraphicsRootDescriptorTable(Rdt::SRV, srvHandle[0]); m_commandList->SetGraphicsRootDescriptorTable(Rdt::SRV, srvHandle[0]);
} }
} }