Branimir Karadžić 8 年之前
父節點
當前提交
05fa433681
共有 2 個文件被更改,包括 33 次插入33 次删除
  1. 32 32
      src/config.h
  2. 1 1
      src/renderer_d3d12.cpp

+ 32 - 32
src/config.h

@@ -12,76 +12,76 @@
 #	define BGFX_CONFIG_DEBUG 0
 #endif // BGFX_CONFIG_DEBUG
 
-#if !defined(BGFX_CONFIG_RENDERER_DIRECT3D9) \
-	&& !defined(BGFX_CONFIG_RENDERER_DIRECT3D11) \
-	&& !defined(BGFX_CONFIG_RENDERER_DIRECT3D12) \
-	&& !defined(BGFX_CONFIG_RENDERER_METAL) \
-	&& !defined(BGFX_CONFIG_RENDERER_OPENGL) \
-	&& !defined(BGFX_CONFIG_RENDERER_OPENGLES) \
-	&& !defined(BGFX_CONFIG_RENDERER_VULKAN) \
-	&& !defined(BGFX_CONFIG_RENDERER_GNM)
+#if !defined(BGFX_CONFIG_RENDERER_DIRECT3D9)  \
+ && !defined(BGFX_CONFIG_RENDERER_DIRECT3D11) \
+ && !defined(BGFX_CONFIG_RENDERER_DIRECT3D12) \
+ && !defined(BGFX_CONFIG_RENDERER_METAL)      \
+ && !defined(BGFX_CONFIG_RENDERER_OPENGL)     \
+ && !defined(BGFX_CONFIG_RENDERER_OPENGLES)   \
+ && !defined(BGFX_CONFIG_RENDERER_VULKAN)     \
+ && !defined(BGFX_CONFIG_RENDERER_GNM)
 
 #	ifndef BGFX_CONFIG_RENDERER_DIRECT3D9
 #		define BGFX_CONFIG_RENDERER_DIRECT3D9 (0 \
-					|| BX_PLATFORM_WINDOWS \
+					|| BX_PLATFORM_WINDOWS       \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_DIRECT3D9
 
 #	ifndef BGFX_CONFIG_RENDERER_DIRECT3D11
 #		define BGFX_CONFIG_RENDERER_DIRECT3D11 (0 \
-					|| BX_PLATFORM_WINDOWS \
-					|| BX_PLATFORM_WINRT \
-					|| BX_PLATFORM_XBOXONE \
+					|| BX_PLATFORM_WINDOWS        \
+					|| BX_PLATFORM_WINRT          \
+					|| BX_PLATFORM_XBOXONE        \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_DIRECT3D11
 
 #	ifndef BGFX_CONFIG_RENDERER_DIRECT3D12
 #		define BGFX_CONFIG_RENDERER_DIRECT3D12 (0 \
-					|| BX_PLATFORM_WINDOWS \
-					|| BX_PLATFORM_WINRT \
-					|| BX_PLATFORM_XBOXONE \
+					|| BX_PLATFORM_WINDOWS        \
+					|| BX_PLATFORM_WINRT          \
+					|| BX_PLATFORM_XBOXONE        \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_DIRECT3D12
 
 #	ifndef BGFX_CONFIG_RENDERER_METAL
-#		define BGFX_CONFIG_RENDERER_METAL (0 \
+#		define BGFX_CONFIG_RENDERER_METAL (0           \
 					|| (BX_PLATFORM_IOS && BX_CPU_ARM) \
-					|| (BX_PLATFORM_OSX >= 101100) \
+					|| (BX_PLATFORM_OSX >= 101100)     \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_METAL
 
 #	ifndef BGFX_CONFIG_RENDERER_OPENGL
 #		define BGFX_CONFIG_RENDERER_OPENGL (0 \
-					|| BX_PLATFORM_BSD \
-					|| BX_PLATFORM_LINUX \
-					|| BX_PLATFORM_OSX \
-					|| BX_PLATFORM_WINDOWS \
+					|| BX_PLATFORM_BSD        \
+					|| BX_PLATFORM_LINUX      \
+					|| BX_PLATFORM_OSX        \
+					|| BX_PLATFORM_WINDOWS    \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_OPENGL
 
 #	ifndef BGFX_CONFIG_RENDERER_OPENGLES
 #		define BGFX_CONFIG_RENDERER_OPENGLES (0 \
-					|| BX_PLATFORM_ANDROID \
-					|| BX_PLATFORM_EMSCRIPTEN \
-					|| BX_PLATFORM_IOS \
-					|| BX_PLATFORM_RPI \
-					|| BX_PLATFORM_STEAMLINK \
-					|| BX_PLATFORM_NX \
+					|| BX_PLATFORM_ANDROID      \
+					|| BX_PLATFORM_EMSCRIPTEN   \
+					|| BX_PLATFORM_IOS          \
+					|| BX_PLATFORM_RPI          \
+					|| BX_PLATFORM_STEAMLINK    \
+					|| BX_PLATFORM_NX           \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_OPENGLES
 
 #	ifndef BGFX_CONFIG_RENDERER_VULKAN
 #		define BGFX_CONFIG_RENDERER_VULKAN (0 \
-					|| BX_PLATFORM_ANDROID \
-					|| BX_PLATFORM_LINUX \
-					|| BX_PLATFORM_WINDOWS \
-					|| BX_PLATFORM_NX \
+					|| BX_PLATFORM_ANDROID    \
+					|| BX_PLATFORM_LINUX      \
+					|| BX_PLATFORM_WINDOWS    \
+					|| BX_PLATFORM_NX         \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_VULKAN
 
 #	ifndef BGFX_CONFIG_RENDERER_GNM
 #		define BGFX_CONFIG_RENDERER_GNM (0 \
-					|| BX_PLATFORM_PS4 \
+					|| BX_PLATFORM_PS4     \
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_GNM
 

+ 1 - 1
src/renderer_d3d12.cpp

@@ -1265,7 +1265,7 @@ namespace bgfx { namespace d3d12
 									| BGFX_CAPS_COMPUTE
 									| (m_options.ROVsSupported ? BGFX_CAPS_FRAGMENT_ORDERING : 0)
 //									| (m_architecture.UMA ? BGFX_CAPS_TEXTURE_DIRECT_ACCESS : 0)
-									| (BX_ENABLED(BX_PLATFORM_WINDOWS) ? BGFX_CAPS_SWAP_CHAIN : 0)
+//									| (BX_ENABLED(BX_PLATFORM_WINDOWS) ? BGFX_CAPS_SWAP_CHAIN : 0)
 									| BGFX_CAPS_TEXTURE_BLIT
 									| BGFX_CAPS_TEXTURE_READ_BACK
 									| BGFX_CAPS_OCCLUSION_QUERY