From d1a6a4723a54da578607100312a57c7915713555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 20 Aug 2015 22:11:13 -0700 Subject: [PATCH] Cleanup. --- src/renderer_d3d12.cpp | 5 +++-- src/renderer_d3d12.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 1dfd051d..1ec0eafa 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -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,8 +916,8 @@ namespace bgfx { namespace d3d12 | BGFX_CAPS_FRAGMENT_DEPTH | BGFX_CAPS_BLEND_INDEPENDENT | BGFX_CAPS_COMPUTE - | BGFX_CAPS_FRAGMENT_ORDERING - // | BGFX_CAPS_SWAP_CHAIN + | (m_options.ROVsSupported ? BGFX_CAPS_FRAGMENT_ORDERING : 0) +// | BGFX_CAPS_SWAP_CHAIN ); g_caps.maxTextureSize = 16384; g_caps.maxFBAttachments = uint8_t(bx::uint32_min(16, BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS) ); diff --git a/src/renderer_d3d12.h b/src/renderer_d3d12.h index 88c2d87e..cbedcf69 100644 --- a/src/renderer_d3d12.h +++ b/src/renderer_d3d12.h @@ -13,15 +13,15 @@ #if defined(__MINGW32__) // BK - temp workaround for MinGW until I nuke d3dx12 usage. extern "C++" { -__extension__ template -const GUID& __mingw_uuidof(); + __extension__ template + const GUID& __mingw_uuidof(); -template<> -const GUID& __mingw_uuidof() -{ - static const GUID IID_ID3D12Device0 = { 0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7 } }; - return IID_ID3D12Device0; -} + template<> + const GUID& __mingw_uuidof() + { + static const GUID IID_ID3D12Device0 = { 0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7 } }; + return IID_ID3D12Device0; + } } #endif // defined(__MINGW32__)