Merge branch 'dev'

This commit is contained in:
Branimir Karadžić 2015-08-20 22:22:13 -07:00
commit 4992ef296b
2 changed files with 11 additions and 10 deletions

View file

@ -700,6 +700,7 @@ namespace bgfx { namespace d3d12
BX_TRACE("D3D12 options:")
BX_TRACE("\tTiledResourcesTier %d", m_options.TiledResourcesTier);
BX_TRACE("\tResourceBindingTier %d", m_options.ResourceBindingTier);
BX_TRACE("\tROVsSupported %d", m_options.ROVsSupported);
BX_TRACE("\tConservativeRasterizationTier %d", m_options.ConservativeRasterizationTier);
BX_TRACE("\tCrossNodeSharingTier %d", m_options.CrossNodeSharingTier);
BX_TRACE("\tResourceHeapTier %d", m_options.ResourceHeapTier);
@ -915,7 +916,7 @@ namespace bgfx { namespace d3d12
| BGFX_CAPS_FRAGMENT_DEPTH
| BGFX_CAPS_BLEND_INDEPENDENT
| BGFX_CAPS_COMPUTE
| BGFX_CAPS_FRAGMENT_ORDERING
| (m_options.ROVsSupported ? BGFX_CAPS_FRAGMENT_ORDERING : 0)
// | BGFX_CAPS_SWAP_CHAIN
);
g_caps.maxTextureSize = 16384;