backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Remove unused memory stat counters

Browse Source
This commit is contained in:
Philip Rebohle 2019-12-13 12:07:45 +01:00
parent ed69da0fff
commit 7a18cb1227
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dxvk/dxvk_device.cpp
View File

@ -160,12 +160,9 @@ namespace dxvk {
DxvkStatCounters DxvkDevice::getStatCounters() { DxvkStatCounters DxvkDevice::getStatCounters() {
DxvkMemoryStats mem = m_objects.memoryManager().getMemoryStats();
DxvkPipelineCount pipe = m_objects.pipelineManager().getPipelineCount(); DxvkPipelineCount pipe = m_objects.pipelineManager().getPipelineCount();
DxvkStatCounters result; DxvkStatCounters result;
result.setCtr(DxvkStatCounter::MemoryAllocated, mem.memoryAllocated);
result.setCtr(DxvkStatCounter::MemoryUsed, mem.memoryUsed);
result.setCtr(DxvkStatCounter::PipeCountGraphics, pipe.numGraphicsPipelines); result.setCtr(DxvkStatCounter::PipeCountGraphics, pipe.numGraphicsPipelines);
result.setCtr(DxvkStatCounter::PipeCountCompute, pipe.numComputePipelines); result.setCtr(DxvkStatCounter::PipeCountCompute, pipe.numComputePipelines);
result.setCtr(DxvkStatCounter::PipeCompilerBusy, m_objects.pipelineManager().isCompilingShaders()); result.setCtr(DxvkStatCounter::PipeCompilerBusy, m_objects.pipelineManager().isCompilingShaders());

14
src/dxvk/dxvk_memory.cpp
View File

@ -232,20 +232,6 @@ namespace dxvk {
} }
DxvkMemoryStats DxvkMemoryAllocator::getMemoryStats() {
std::lock_guard<std::mutex> lock(m_mutex);
DxvkMemoryStats totalStats;
for (size_t i = 0; i < m_memProps.memoryHeapCount; i++) {
totalStats.memoryAllocated += m_memHeaps[i].stats.memoryAllocated;
totalStats.memoryUsed += m_memHeaps[i].stats.memoryUsed;
}
return totalStats;
}
DxvkMemory DxvkMemoryAllocator::tryAlloc( DxvkMemory DxvkMemoryAllocator::tryAlloc(
const VkMemoryRequirements* req, const VkMemoryRequirements* req,
const VkMemoryDedicatedAllocateInfoKHR* dedAllocInfo, const VkMemoryDedicatedAllocateInfoKHR* dedAllocInfo,

9
src/dxvk/dxvk_memory.h
View File

@ -262,15 +262,6 @@ namespace dxvk {
VkMemoryPropertyFlags flags, VkMemoryPropertyFlags flags,
float priority); float priority);
/**
* \brief Queries memory stats
*
* Returns the total amount of device memory
* allocated and used by all available heaps.
* \returns Global memory stats
*/
DxvkMemoryStats getMemoryStats();
/** /**
* \brief Queries memory stats * \brief Queries memory stats
* *

3
src/dxvk/dxvk_stats.h
View File

@ -14,9 +14,6 @@ namespace dxvk {
CmdDrawCalls, ///< Number of draw calls CmdDrawCalls, ///< Number of draw calls
CmdDispatchCalls, ///< Number of compute calls CmdDispatchCalls, ///< Number of compute calls
CmdRenderPassCount, ///< Number of render passes CmdRenderPassCount, ///< Number of render passes
MemoryAllocationCount, ///< Number of memory allocations
MemoryAllocated, ///< Amount of memory allocated
MemoryUsed, ///< Amount of memory used
PipeCountGraphics, ///< Number of graphics pipelines PipeCountGraphics, ///< Number of graphics pipelines
PipeCountCompute, ///< Number of compute pipelines PipeCountCompute, ///< Number of compute pipelines
PipeCompilerBusy, ///< Boolean indicating compiler activity PipeCompilerBusy, ///< Boolean indicating compiler activity