mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2018-01-23 20:39:30 -08:00
parent 21a55c5c67
commit 05fa433681
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/config.h
View File

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

2
src/renderer_d3d12.cpp
View File

@ -1265,7 +1265,7 @@ namespace bgfx { namespace d3d12
| BGFX_CAPS_COMPUTE | BGFX_CAPS_COMPUTE
| (m_options.ROVsSupported ? BGFX_CAPS_FRAGMENT_ORDERING : 0) | (m_options.ROVsSupported ? BGFX_CAPS_FRAGMENT_ORDERING : 0)
// | (m_architecture.UMA ? BGFX_CAPS_TEXTURE_DIRECT_ACCESS : 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_BLIT
| BGFX_CAPS_TEXTURE_READ_BACK | BGFX_CAPS_TEXTURE_READ_BACK
| BGFX_CAPS_OCCLUSION_QUERY | BGFX_CAPS_OCCLUSION_QUERY