diff options
| -rwxr-xr-x | lib/librenderdoc.so | bin | 21955488 -> 0 bytes | |||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/vk-renderer.cpp | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/lib/librenderdoc.so b/lib/librenderdoc.so Binary files differdeleted file mode 100755 index 03dc0a9..0000000 --- a/lib/librenderdoc.so +++ /dev/null diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a80e045..c185ebe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${Vulkan_INCLUDE_DIRS}) -link_directories(${CMAKE_SOURCE_DIR}/lib) add_executable( path-tracer @@ -22,5 +21,3 @@ add_executable( if(UNIX) target_link_libraries(path-tracer ${CMAKE_DL_LIBS}) endif() - -target_link_libraries(path-tracer renderdoc) diff --git a/src/main.cpp b/src/main.cpp index 6b32ae6..d701e83 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,6 +2,7 @@ #include <vector> #include <cstring> #include <cstdio> +#include <cassert> #include <dlfcn.h> #include "vk-renderer.hpp" @@ -73,9 +74,8 @@ int main() { if(void *mod = dlopen("librenderdoc.so", RTLD_NOW | RTLD_NOLOAD)) { pRENDERDOC_GetAPI RENDERDOC_GetAPI = (pRENDERDOC_GetAPI)dlsym(mod, "RENDERDOC_GetAPI"); - int ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_1_2, (void **)&rdoc_api); - std::cerr << "Cannot get renderdoc API" << std::endl; - } + int ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_4_1, (void **)&rdoc_api); + assert(ret == 1); vkrenderer renderer {}; // Image dimensions diff --git a/src/vk-renderer.cpp b/src/vk-renderer.cpp index 4b33a98..1cd3c64 100644 --- a/src/vk-renderer.cpp +++ b/src/vk-renderer.cpp @@ -84,7 +84,8 @@ void vkrenderer::create_instance() { "VK_LAYER_KHRONOS_validation", }; std::vector<const char*> extensions = { - VK_EXT_DEBUG_UTILS_EXTENSION_NAME + VK_EXT_DEBUG_UTILS_EXTENSION_NAME, + "VK_KHR_surface" }; VkInstanceCreateInfo instance_create_info = {}; |