Add NV project on all platforms, only include aftermath stubs

baldurk · Nov 24, 2024 · 0d98c97 · 0d98c97
1 parent 97c7586
commit 0d98c97
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
@@ -585,7 +585,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 OR ENABLE_VULKAN))
+if(ENABLE_GL OR ENABLE_GLES OR ENABLE_VULKAN)
     add_subdirectory(driver/ihv/nv)
     list(APPEND renderdoc_objects $<TARGET_OBJECTS:rdoc_nv>)
 endif()

diff --git a/renderdoc/driver/ihv/nv/CMakeLists.txt b/renderdoc/driver/ihv/nv/CMakeLists.txt
@@ -1,17 +1,22 @@
 set(sources
-    nv_counter_enumerator.cpp
-    nv_counter_enumerator.h
-    nv_gl_counters.h
-    nv_vk_counters.h
     nv_aftermath.h
     nv_aftermath.cpp)
 
-if(ENABLE_GL OR ENABLE_GLES)
-    set(sources_gl nv_gl_counters.cpp)
-endif()
+# only include counters on normal windows/linux platforms, others just get aftermath stubs
+if(NOT ANDROID AND NOT ENABLE_APPLE)
+    list(APPEND sources
+        nv_counter_enumerator.cpp
+        nv_counter_enumerator.h
+        nv_gl_counters.h
+        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)
+    if(ENABLE_VULKAN)
+        set(sources_vulkan nv_vk_counters.cpp)
+    endif()
 endif()
 
 set(include_dirs

diff --git a/renderdoc/driver/ihv/nv/nv_aftermath.cpp b/renderdoc/driver/ihv/nv/nv_aftermath.cpp
@@ -41,7 +41,7 @@ RDOC_CONFIG(bool, Replay_Debug_EnableNVRTValidation, false,
 #include "driver/ihv/nv/official/aftermath/GFSDK_Aftermath_GpuCrashDumpDecoding.h"
 
 // assume this macro is only available if we got the real headers
-#if defined(GFSDK_AFTERMATH_CALL)
+#if defined(GFSDK_AFTERMATH_CALL) && ENABLED(RDOC_WIN32)
 
 #include "official/nvapi/nvapi.h"