From 2cd474c4961294a860dd164caedae846fa583876 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 22 Dec 2022 20:52:30 +0000 Subject: [PATCH] Disable NV counters on Apple --- renderdoc/driver/gl/gl_counters.cpp | 6 +++--- renderdoc/driver/gl/gl_replay.cpp | 8 ++++---- renderdoc/driver/gl/gl_replay.h | 2 +- renderdoc/driver/vulkan/vk_counters.cpp | 6 +++--- renderdoc/driver/vulkan/vk_debug.cpp | 4 ++-- renderdoc/driver/vulkan/vk_replay.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/renderdoc/driver/gl/gl_counters.cpp b/renderdoc/driver/gl/gl_counters.cpp index cdae2b782..cd163a436 100644 --- a/renderdoc/driver/gl/gl_counters.cpp +++ b/renderdoc/driver/gl/gl_counters.cpp @@ -72,7 +72,7 @@ rdcarray GLReplay::EnumerateCounters() ret.append(m_pARMCounters->GetPublicCounterIds()); } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) if(m_pNVCounters) { ret.append(m_pNVCounters->EnumerateCounters()); @@ -115,7 +115,7 @@ CounterDescription GLReplay::DescribeCounter(GPUCounter counterID) return m_pARMCounters->GetCounterDescription(counterID); } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) /////NVIDIA///// if(m_pNVCounters && m_pNVCounters->HasCounter(counterID)) { @@ -622,7 +622,7 @@ rdcarray GLReplay::FetchCounters(const rdcarray &allC ret = FetchCountersARM(armCounters); } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) if(m_pNVCounters) { // Filter out the NVIDIA counters diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index 12abf6513..73a368fad 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/renderdoc/driver/gl/gl_replay.cpp @@ -73,7 +73,7 @@ void GLReplay::Shutdown() SAFE_DELETE(m_pAMDCounters); SAFE_DELETE(m_pIntelCounters); SAFE_DELETE(m_pARMCounters); -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) SAFE_DELETE(m_pNVCounters); #endif @@ -265,7 +265,7 @@ void GLReplay::SetReplayData(GLWindowingData data) AMDCounters *countersAMD = NULL; IntelGlCounters *countersIntel = NULL; ARMCounters *countersARM = NULL; -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) NVGLCounters *countersNV = NULL; #endif @@ -326,7 +326,7 @@ void GLReplay::SetReplayData(GLWindowingData data) RDCLOG("ARM Mali GPU detected - trying to initialise ARM counters"); countersARM = new ARMCounters(); } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) else if(m_DriverInfo.vendor == GPUVendor::nVidia) { RDCLOG("NVIDIA GPU detected - trying to initialise NVIDIA counters"); @@ -369,7 +369,7 @@ void GLReplay::SetReplayData(GLWindowingData data) m_pARMCounters = NULL; } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) if(countersNV && countersNV->Init()) { m_pNVCounters = countersNV; diff --git a/renderdoc/driver/gl/gl_replay.h b/renderdoc/driver/gl/gl_replay.h index e1d0e2574..9a9e27ca0 100644 --- a/renderdoc/driver/gl/gl_replay.h +++ b/renderdoc/driver/gl/gl_replay.h @@ -509,7 +509,7 @@ private: rdcarray FetchCountersARM(const rdcarray &counters); -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) // NVIDIA counter instance NVGLCounters *m_pNVCounters = NULL; #endif diff --git a/renderdoc/driver/vulkan/vk_counters.cpp b/renderdoc/driver/vulkan/vk_counters.cpp index b21ac8025..18b6a3276 100644 --- a/renderdoc/driver/vulkan/vk_counters.cpp +++ b/renderdoc/driver/vulkan/vk_counters.cpp @@ -171,7 +171,7 @@ rdcarray VulkanReplay::EnumerateCounters() ret.append(m_pAMDCounters->GetPublicCounterIds()); } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) if(m_pNVCounters) { ret.append(m_pNVCounters->EnumerateCounters()); @@ -197,7 +197,7 @@ CounterDescription VulkanReplay::DescribeCounter(GPUCounter counterID) } } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) /////NVIDIA////// if(m_pNVCounters && m_pNVCounters->HasCounter(counterID)) { @@ -870,7 +870,7 @@ rdcarray VulkanReplay::FetchCounters(const rdcarray & } } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) if(m_pNVCounters) { // Filter out the NVIDIA counters diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index 74244dbb1..e2ade4b6c 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -3043,7 +3043,7 @@ void VulkanReplay::CreateResources() m_pAMDCounters = NULL; } } -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) else if(vendor == GPUVendor::nVidia) { RDCLOG("NVIDIA GPU detected - trying to initialise NVIDIA counters"); @@ -3084,7 +3084,7 @@ void VulkanReplay::DestroyResources() SAFE_DELETE(m_pAMDCounters); -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) SAFE_DELETE(m_pNVCounters); #endif } diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h index ab768e193..978a3b801 100644 --- a/renderdoc/driver/vulkan/vk_replay.h +++ b/renderdoc/driver/vulkan/vk_replay.h @@ -795,7 +795,7 @@ private: VulkanAMDActionCallback *m_pAMDActionCallback = NULL; -#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID) +#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE) NVVulkanCounters *m_pNVCounters = NULL; #endif