From fee8885177e3345d49f26da0e34374fdb8843f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 21 Dec 2017 18:12:42 -0800 Subject: [PATCH] Cleanup. --- src/renderer_d3d11.cpp | 7 ------- src/renderer_d3d12.cpp | 4 ++++ src/renderer_d3d12.h | 20 +++++++++++++------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 7025f7377..6ce6f0483 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -1177,13 +1177,6 @@ namespace bgfx { namespace d3d11 } } - if (NULL != m_renderdocdll) - { - // RenderDoc doesn't support ID3D11Device3 yet: - // https://github.com/baldurk/renderdoc/issues/235 - m_deviceInterfaceVersion = bx::uint32_min(m_deviceInterfaceVersion, 1); - } - IDXGIDevice* device = NULL; IDXGIAdapter* adapter = NULL; hr = E_FAIL; diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 40013af37..2fb94a112 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -15,8 +15,10 @@ # endif // BX_PLATFORM_WINRT #endif // !BX_PLATFORM_WINDOWS +#if BX_PLATFORM_WINDOWS PFN_PIX_GET_THREAD_INFO bgfx_PIXGetThreadInfo; PFN_PIX_EVENTS_REPLACE_BLOCK bgfx_PIXEventsReplaceBlock; +#endif // BX_PLATFORM_WINDOWS namespace bgfx { namespace d3d12 { @@ -628,6 +630,7 @@ namespace bgfx { namespace d3d12 ErrorState::Enum errorState = ErrorState::Default; LUID luid; +#if BX_PLATFORM_WINDOWS m_winPixEvent = bx::dlopen("WinPixEventRuntime.dll"); if (NULL != m_winPixEvent) @@ -642,6 +645,7 @@ namespace bgfx { namespace d3d12 bgfx_PIXGetThreadInfo = stubPIXGetThreadInfo; bgfx_PIXEventsReplaceBlock = stubPIXEventsReplaceBlock; } +#endif // BX_PLATFORM_WINDOWS m_renderdocdll = loadRenderDoc(); setGraphicsDebuggerPresent(NULL != m_renderdocdll || NULL != m_winPixEvent); diff --git a/src/renderer_d3d12.h b/src/renderer_d3d12.h index d575eb1ef..16dbd4518 100644 --- a/src/renderer_d3d12.h +++ b/src/renderer_d3d12.h @@ -52,21 +52,27 @@ BX_PRAGMA_DIAGNOSTIC_POP(); #include "shader_dxbc.h" #include "debug_renderdoc.h" +#if BGFX_CONFIG_DEBUG_PIX +# if BX_PLATFORM_WINDOWS typedef struct PIXEventsThreadInfo* (WINAPI* PFN_PIX_GET_THREAD_INFO)(); typedef uint64_t (WINAPI* PFN_PIX_EVENTS_REPLACE_BLOCK)(bool _getEarliestTime); extern PFN_PIX_GET_THREAD_INFO bgfx_PIXGetThreadInfo; extern PFN_PIX_EVENTS_REPLACE_BLOCK bgfx_PIXEventsReplaceBlock; -#define PIXGetThreadInfo bgfx_PIXGetThreadInfo -#define PIXEventsReplaceBlock bgfx_PIXEventsReplaceBlock -#include +# define PIXGetThreadInfo bgfx_PIXGetThreadInfo +# define PIXEventsReplaceBlock bgfx_PIXEventsReplaceBlock +# else +extern "C" struct PIXEventsThreadInfo* WINAPI PIXGetThreadInfo(); +extern "C" uint64_t WINAPI PIXEventsReplaceBlock(bool _getEarliestTime); +# endif // BX_PLATFORM_WINDOWS -#define _PIX3_BEGINEVENT(_commandList, _color, _name) PIXBeginEvent(_commandList, _color, _name) -#define _PIX3_SETMARKER(_commandList, _color, _name) PIXSetMarker(_commandList, _color, _name) -#define _PIX3_ENDEVENT(_commandList) PIXEndEvent(_commandList) +# include + +# define _PIX3_BEGINEVENT(_commandList, _color, _name) PIXBeginEvent(_commandList, _color, _name) +# define _PIX3_SETMARKER(_commandList, _color, _name) PIXSetMarker(_commandList, _color, _name) +# define _PIX3_ENDEVENT(_commandList) PIXEndEvent(_commandList) -#if BGFX_CONFIG_DEBUG_PIX # define PIX3_BEGINEVENT(_commandList, _color, _name) _PIX3_BEGINEVENT(_commandList, _color, _name) # define PIX3_SETMARKER(_commandList, _color, _name) _PIX3_SETMARKER(_commandList, _color, _name) # define PIX3_ENDEVENT(_commandList) _PIX3_ENDEVENT(_commandList)