diff options
author | 2015-10-15 10:42:29 +0200 | |
---|---|---|
committer | 2015-10-15 10:42:29 +0200 | |
commit | 8981faa61fc1e9421805938e6656d84ff61be1f9 (patch) | |
tree | 6295fadfe79ab1f2bafafd3f321e01063ca3cff7 /3rdparty/bgfx/src/renderdoc.cpp | |
parent | a74a7a37ef1f6ea1fd9c96148be8fa7ba09b1054 (diff) |
update bgfx to latest (nw)
Diffstat (limited to '3rdparty/bgfx/src/renderdoc.cpp')
-rw-r--r-- | 3rdparty/bgfx/src/renderdoc.cpp | 57 |
1 files changed, 13 insertions, 44 deletions
diff --git a/3rdparty/bgfx/src/renderdoc.cpp b/3rdparty/bgfx/src/renderdoc.cpp index b7d66e37e35..ac2e2917fa6 100644 --- a/3rdparty/bgfx/src/renderdoc.cpp +++ b/3rdparty/bgfx/src/renderdoc.cpp @@ -55,27 +55,8 @@ namespace bgfx return false; } -#define RENDERDOC_IMPORT \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_Shutdown); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_SetLogFile); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_GetCapture); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_SetCaptureOptions); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_SetActiveWindow); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_TriggerCapture); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_StartFrameCapture); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_EndFrameCapture); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_GetOverlayBits); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_MaskOverlayBits); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_SetFocusToggleKeys); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_SetCaptureKeys); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_InitRemoteAccess); \ - RENDERDOC_IMPORT_FUNC(RENDERDOC_UnloadCrashHandler); - -#define RENDERDOC_IMPORT_FUNC(_func) p##_func _func - RENDERDOC_IMPORT -#undef RENDERDOC_IMPORT_FUNC - - pRENDERDOC_GetAPIVersion RENDERDOC_GetAPIVersion; + pRENDERDOC_GetAPI RENDERDOC_GetAPI; + static RENDERDOC_API_1_0_0* s_renderDoc; void* loadRenderDoc() { @@ -89,33 +70,21 @@ namespace bgfx if (NULL != renderdocdll) { - RENDERDOC_GetAPIVersion = (pRENDERDOC_GetAPIVersion)bx::dlsym(renderdocdll, "RENDERDOC_GetAPIVersion"); - if (NULL != RENDERDOC_GetAPIVersion - && RENDERDOC_API_VERSION == RENDERDOC_GetAPIVersion() ) + RENDERDOC_GetAPI = (pRENDERDOC_GetAPI)bx::dlsym(renderdocdll, "RENDERDOC_GetAPI"); + if (NULL != RENDERDOC_GetAPI + && 1 == RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_0_0, (void**)&s_renderDoc) ) { -#define RENDERDOC_IMPORT_FUNC(_func) \ - _func = (p##_func)bx::dlsym(renderdocdll, #_func); \ - BX_TRACE("%p " #_func, _func); -RENDERDOC_IMPORT -#undef RENDERDOC_IMPORT_FUNC + s_renderDoc->SetLogFilePathTemplate("temp/bgfx"); - RENDERDOC_SetLogFile("temp/bgfx"); + s_renderDoc->SetFocusToggleKeys(NULL, 0); - RENDERDOC_SetFocusToggleKeys(NULL, 0); + RENDERDOC_InputButton captureKey = eRENDERDOC_Key_F11; + s_renderDoc->SetCaptureKeys(&captureKey, 1); - KeyButton captureKey = eKey_F11; - RENDERDOC_SetCaptureKeys(&captureKey, 1); + s_renderDoc->SetCaptureOptionU32(eRENDERDOC_Option_AllowVSync, 1); + s_renderDoc->SetCaptureOptionU32(eRENDERDOC_Option_SaveAllInitials, 1); - CaptureOptions opt; - memset(&opt, 0, sizeof(opt) ); - opt.AllowVSync = 1; - opt.SaveAllInitials = 1; - RENDERDOC_SetCaptureOptions(&opt); - - uint32_t ident = 0; - RENDERDOC_InitRemoteAccess(&ident); - - RENDERDOC_MaskOverlayBits(eOverlay_None, eOverlay_None); + s_renderDoc->MaskOverlayBits(eRENDERDOC_Overlay_None, eRENDERDOC_Overlay_None); } else { @@ -131,7 +100,7 @@ RENDERDOC_IMPORT { if (NULL != _renderdocdll) { - RENDERDOC_Shutdown(); + s_renderDoc->Shutdown(); bx::dlclose(_renderdocdll); } } |