From c34c57fe5c53b80b3761fe4494eb12637e72ded2 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 8 Jan 2019 11:38:22 +0000 Subject: [PATCH] Initialise latest renderdoc API in demos project * We initialise both 1.0.0 for maximum compatibility, and the latest version for maximum functionality. * It's currently unused anyway --- util/test/demos/test_common.cpp | 7 ++++++- util/test/demos/test_common.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/util/test/demos/test_common.cpp b/util/test/demos/test_common.cpp index 32e8f6e56..5582ce043 100644 --- a/util/test/demos/test_common.cpp +++ b/util/test/demos/test_common.cpp @@ -388,10 +388,15 @@ bool GraphicsTest::Init(int argc, char **argv) { pRENDERDOC_GetAPI RENDERDOC_GetAPI = (pRENDERDOC_GetAPI)GetProcAddress(mod, "RENDERDOC_GetAPI"); - int ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_0_0, (void **)&rdoc); + int ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_4_0, (void **)&rdoc); if(ret != 1) rdoc = NULL; + + ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_0_0, (void **)&rdoc100); + + if(ret != 1) + rdoc100 = NULL; } #else diff --git a/util/test/demos/test_common.h b/util/test/demos/test_common.h index 60efee890..34e8d9e77 100644 --- a/util/test/demos/test_common.h +++ b/util/test/demos/test_common.h @@ -172,7 +172,8 @@ struct GraphicsTest bool debugDevice = false; bool headless = false; - RENDERDOC_API_1_0_0 *rdoc = NULL; + RENDERDOC_API_1_0_0 *rdoc100 = NULL; + RENDERDOC_API_1_4_0 *rdoc = NULL; }; enum class TestAPI