lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-28 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable NV counters on Apple

Browse Source
This commit is contained in:
baldurk
2022-12-22 20:52:30 +00:00
parent 98d4af8af5
commit 2cd474c496
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_counters.cpp
+3 -3
View File
@@ -72,7 +72,7 @@ rdcarray<GPUCounter> 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<CounterResult> GLReplay::FetchCounters(const rdcarray<GPUCounter> &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
renderdoc/driver/gl/gl_replay.cpp
+4 -4
View File
@@ -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;
renderdoc/driver/gl/gl_replay.h
+1 -1
View File
@@ -509,7 +509,7 @@ private:
rdcarray<CounterResult> FetchCountersARM(const rdcarray<GPUCounter> &counters);
#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID)
#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE)
// NVIDIA counter instance
NVGLCounters *m_pNVCounters = NULL;
#endif
renderdoc/driver/vulkan/vk_counters.cpp
+3 -3
View File
@@ -171,7 +171,7 @@ rdcarray<GPUCounter> 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<CounterResult> VulkanReplay::FetchCounters(const rdcarray<GPUCounter> &
}
}
#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_ANDROID)
#if DISABLED(RDOC_ANDROID) && DISABLED(RDOC_APPLE)
if(m_pNVCounters)
{
// Filter out the NVIDIA counters
renderdoc/driver/vulkan/vk_debug.cpp
+2 -2
View File
@@ -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
}
renderdoc/driver/vulkan/vk_replay.h
+1 -1
View File
@@ -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