Merge branch 'dev'

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) );

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<typename Ty>
-const GUID& __mingw_uuidof();
+	__extension__ template<typename Ty>
+	const GUID& __mingw_uuidof();
 
-template<>
-const GUID& __mingw_uuidof<ID3D12Device>()
-{
-	static const GUID IID_ID3D12Device0 = { 0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7 } };
-	return IID_ID3D12Device0;
-}
+	template<>
+	const GUID& __mingw_uuidof<ID3D12Device>()
+	{
+		static const GUID IID_ID3D12Device0 = { 0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7 } };
+		return IID_ID3D12Device0;
+	}
 }
 #endif // defined(__MINGW32__)