This commit is contained in:
Branimir Karadžić 2015-08-20 22:11:13 -07:00
parent 90c9f880b8
commit d1a6a4723a
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("D3D12 options:")
BX_TRACE("\tTiledResourcesTier %d", m_options.TiledResourcesTier); BX_TRACE("\tTiledResourcesTier %d", m_options.TiledResourcesTier);
BX_TRACE("\tResourceBindingTier %d", m_options.ResourceBindingTier); BX_TRACE("\tResourceBindingTier %d", m_options.ResourceBindingTier);
BX_TRACE("\tROVsSupported %d", m_options.ROVsSupported);
BX_TRACE("\tConservativeRasterizationTier %d", m_options.ConservativeRasterizationTier); BX_TRACE("\tConservativeRasterizationTier %d", m_options.ConservativeRasterizationTier);
BX_TRACE("\tCrossNodeSharingTier %d", m_options.CrossNodeSharingTier); BX_TRACE("\tCrossNodeSharingTier %d", m_options.CrossNodeSharingTier);
BX_TRACE("\tResourceHeapTier %d", m_options.ResourceHeapTier); BX_TRACE("\tResourceHeapTier %d", m_options.ResourceHeapTier);
@ -915,8 +916,8 @@ namespace bgfx { namespace d3d12
| BGFX_CAPS_FRAGMENT_DEPTH | BGFX_CAPS_FRAGMENT_DEPTH
| BGFX_CAPS_BLEND_INDEPENDENT | BGFX_CAPS_BLEND_INDEPENDENT
| BGFX_CAPS_COMPUTE | BGFX_CAPS_COMPUTE
| BGFX_CAPS_FRAGMENT_ORDERING | (m_options.ROVsSupported ? BGFX_CAPS_FRAGMENT_ORDERING : 0)
// | BGFX_CAPS_SWAP_CHAIN // | BGFX_CAPS_SWAP_CHAIN
); );
g_caps.maxTextureSize = 16384; g_caps.maxTextureSize = 16384;
g_caps.maxFBAttachments = uint8_t(bx::uint32_min(16, BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS) ); g_caps.maxFBAttachments = uint8_t(bx::uint32_min(16, BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS) );

View file

@ -13,15 +13,15 @@
#if defined(__MINGW32__) // BK - temp workaround for MinGW until I nuke d3dx12 usage. #if defined(__MINGW32__) // BK - temp workaround for MinGW until I nuke d3dx12 usage.
extern "C++" { extern "C++" {
__extension__ template<typename Ty> __extension__ template<typename Ty>
const GUID& __mingw_uuidof(); const GUID& __mingw_uuidof();
template<> template<>
const GUID& __mingw_uuidof<ID3D12Device>() const GUID& __mingw_uuidof<ID3D12Device>()
{ {
static const GUID IID_ID3D12Device0 = { 0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7 } }; static const GUID IID_ID3D12Device0 = { 0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7 } };
return IID_ID3D12Device0; return IID_ID3D12Device0;
} }
} }
#endif // defined(__MINGW32__) #endif // defined(__MINGW32__)