From c86e8d2446c90310e86063e2c84d296c74e5df0b Mon Sep 17 00:00:00 2001 From: Shahbaz Youssefi Date: Wed, 11 Jan 2023 11:26:31 -0500 Subject: [PATCH] Fix Vulkan-only build NVIDIA counters build assumed Vulkan build implies GL build. This is not necessarily the case. --- renderdoc/CMakeLists.txt | 2 +- renderdoc/driver/ihv/nv/CMakeLists.txt | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index 830183fa4..846415b5b 100644 --- a/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt @@ -565,7 +565,7 @@ if(ENABLE_GL OR ENABLE_GLES) endif() # pull in the NVIDIA folder -if(NOT ANDROID AND NOT APPLE AND (ENABLE_GL OR ENABLE_GLES)) +if(NOT ANDROID AND NOT APPLE AND (ENABLE_GL OR ENABLE_GLES OR ENABLE_VULKAN)) add_subdirectory(driver/ihv/nv) list(APPEND renderdoc_objects $) endif() diff --git a/renderdoc/driver/ihv/nv/CMakeLists.txt b/renderdoc/driver/ihv/nv/CMakeLists.txt index ec8f1a974..6d0a49e95 100644 --- a/renderdoc/driver/ihv/nv/CMakeLists.txt +++ b/renderdoc/driver/ihv/nv/CMakeLists.txt @@ -1,16 +1,22 @@ set(sources nv_counter_enumerator.cpp nv_counter_enumerator.h - nv_gl_counters.cpp nv_gl_counters.h - nv_vk_counters.cpp nv_vk_counters.h) +if(ENABLE_GL OR ENABLE_GLES) + set(sources_gl nv_gl_counters.cpp) +endif() + +if(ENABLE_VULKAN) + set(sources_vulkan nv_vk_counters.cpp) +endif() + set(include_dirs ${RDOC_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/official/PerfSDK/redist/include" "${CMAKE_CURRENT_SOURCE_DIR}/official/PerfSDK/redist/NvPerfUtility/include") -add_library(rdoc_nv OBJECT ${sources}) +add_library(rdoc_nv OBJECT ${sources} ${sources_gl} ${sources_vulkan}) target_compile_definitions(rdoc_nv ${RDOC_DEFINITIONS}) target_include_directories(rdoc_nv ${include_dirs})