Allow other backends than Vulkan to have GPU memory stats. Implement for GL.

Common/GPU/GPUBackendCommon.cpp

@@ -0,0 +1,28 @@
+#include <mutex>
+#include <set>
+
+#include "Common/GPU/GPUBackendCommon.h"
+
+// Global push buffer tracker for GPU memory profiling.
+// Don't want to manually dig up all the active push buffers.
+static std::mutex g_pushBufferListMutex;
+static std::set<GPUMemoryManager *> g_pushBuffers;
+
+std::vector<GPUMemoryManager *> GetActiveGPUMemoryManagers() {
+	std::vector<GPUMemoryManager *> buffers;
+	std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
+	for (auto iter : g_pushBuffers) {
+		buffers.push_back(iter);
+	}
+	return buffers;
+}
+
+void RegisterGPUMemoryManager(GPUMemoryManager *manager) {
+	std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
+	g_pushBuffers.insert(manager);
+}
+
+void UnregisterGPUMemoryManager(GPUMemoryManager *manager) {
+	std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
+	g_pushBuffers.erase(manager);
+}

Common/GPU/GPUBackendCommon.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <vector>
+
+// Just an abstract thing to get debug information.
+class GPUMemoryManager {
+public:
+	virtual ~GPUMemoryManager() {}
+
+	virtual void GetDebugString(char *buffer, size_t bufSize) const = 0;
+	virtual const char *Name() const = 0;  // for sorting
+};
+
+std::vector<GPUMemoryManager *> GetActiveGPUMemoryManagers();
+
+void RegisterGPUMemoryManager(GPUMemoryManager *manager);
+void UnregisterGPUMemoryManager(GPUMemoryManager *manager);

Common/GPU/OpenGL/GLMemory.cpp

@@ -2,6 +2,7 @@
 #include "Common/GPU/OpenGL/GLMemory.h"
 #include "Common/GPU/OpenGL/GLRenderManager.h"
 #include "Common/GPU/OpenGL/GLFeatures.h"
+#include "Common/Data/Text/Parsers.h"
 
 extern std::thread::id renderThreadId;
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
@@ -64,9 +65,11 @@ bool GLRBuffer::Unmap() {
 GLPushBuffer::GLPushBuffer(GLRenderManager *render, GLuint target, size_t size, const char *tag) : render_(render), size_(size), target_(target), tag_(tag) {
 	bool res = AddBuffer();
 	_assert_(res);
+	RegisterGPUMemoryManager(this);
 }
 
 GLPushBuffer::~GLPushBuffer() {
+	UnregisterGPUMemoryManager(this);
 	Destroy(true);
 }
 
@@ -279,3 +282,7 @@ void GLPushBuffer::UnmapDevice() {
 		}
 	}
 }
+
+void GLPushBuffer::GetDebugString(char *buffer, size_t bufSize) const {
+	snprintf(buffer, bufSize, "%s: %d/%d", tag_, NiceSizeFormat(this->offset_).c_str(), NiceSizeFormat(this->size_).c_str());
+}

Common/GPU/OpenGL/GLMemory.h

@@ -4,6 +4,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "Common/GPU/GPUBackendCommon.h"
 #include "Common/GPU/OpenGL/GLCommon.h"
 #include "Common/Log.h"
 
@@ -61,7 +62,7 @@ class GLRenderManager;
 // trouble.
 // We need to manage the lifetime of this together with the other resources so its destructor
 // runs on the render thread.
-class GLPushBuffer {
+class GLPushBuffer : public GPUMemoryManager {
 public:
 	friend class GLRenderManager;
 
@@ -78,6 +79,10 @@ public:
 
 	void Reset() { offset_ = 0; }
 
+	void GetDebugString(char *buffer, size_t bufSize) const override;
+
+	const char *Name() const override { return tag_; };  // for sorting
+
 	// Utility for users of this class, not used internally.
 	const uint32_t INVALID_OFFSET = 0xFFFFFFFF;
 

Common/GPU/Vulkan/VulkanMemory.cpp

@@ -35,37 +35,15 @@ using namespace PPSSPP_VK;
 // Always keep around push buffers at least this long (seconds).
 static const double PUSH_GARBAGE_COLLECTION_DELAY = 10.0;
 
-// Global push buffer tracker for vulkan memory profiling.
-// Don't want to manually dig up all the active push buffers.
-static std::mutex g_pushBufferListMutex;
-static std::set<VulkanMemoryManager *> g_pushBuffers;
-
-std::vector<VulkanMemoryManager *> GetActiveVulkanMemoryManagers() {
-	std::vector<VulkanMemoryManager *> buffers;
-	std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
-	for (auto iter : g_pushBuffers) {
-		buffers.push_back(iter);
-	}
-	return buffers;
-}
-
 VulkanPushBuffer::VulkanPushBuffer(VulkanContext *vulkan, const char *name, size_t size, VkBufferUsageFlags usage)
 		: vulkan_(vulkan), name_(name), size_(size), usage_(usage) {
-	{
-		std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
-		g_pushBuffers.insert(this);
-	}
-
+	RegisterGPUMemoryManager(this);
 	bool res = AddBuffer();
 	_assert_(res);
 }
 
 VulkanPushBuffer::~VulkanPushBuffer() {
-	{
-		std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
-		g_pushBuffers.erase(this);
-	}
-
+	UnregisterGPUMemoryManager(this);
 	_dbg_assert_(!writePtr_);
 	_assert_(buffers_.empty());
 }
@@ -276,11 +254,7 @@ VkResult VulkanDescSetPool::Recreate(bool grow) {
 
 VulkanPushPool::VulkanPushPool(VulkanContext *vulkan, const char *name, size_t originalBlockSize, VkBufferUsageFlags usage)
 	: vulkan_(vulkan), name_(name), originalBlockSize_(originalBlockSize), usage_(usage) {
-	{
-		std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
-		g_pushBuffers.insert(this);
-	}
-
+	RegisterGPUMemoryManager(this);
 	for (int i = 0; i < VulkanContext::MAX_INFLIGHT_FRAMES; i++) {
 		blocks_.push_back(CreateBlock(originalBlockSize));
 		blocks_.back().original = true;
@@ -289,11 +263,7 @@ VulkanPushPool::VulkanPushPool(VulkanContext *vulkan, const char *name, size_t o
 }
 
 VulkanPushPool::~VulkanPushPool() {
-	{
-		std::lock_guard<std::mutex> guard(g_pushBufferListMutex);
-		g_pushBuffers.erase(this);
-	}
-
+	UnregisterGPUMemoryManager(this);
 	_dbg_assert_(blocks_.empty());
 }
 

Common/GPU/Vulkan/VulkanMemory.h

@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "Common/GPU/Vulkan/VulkanContext.h"
+#include "Common/GPU/GPUBackendCommon.h"
 
 // Forward declaration
 VK_DEFINE_HANDLE(VmaAllocation);
@@ -14,22 +15,13 @@ VK_DEFINE_HANDLE(VmaAllocation);
 //
 // Vulkan memory management utils.
 
-// Just an abstract thing to get debug information.
-class VulkanMemoryManager {
-public:
-	virtual ~VulkanMemoryManager() {}
-
-	virtual void GetDebugString(char *buffer, size_t bufSize) const = 0;
-	virtual const char *Name() const = 0;  // for sorting
-};
-
 // VulkanPushBuffer
 // Simple incrementing allocator.
 // Use these to push vertex, index and uniform data. Generally you'll have two or three of these
 // and alternate on each frame. Make sure not to reset until the fence from the last time you used it
 // has completed.
 // NOTE: This has now been replaced with VulkanPushPool for all uses except the vertex cache.
-class VulkanPushBuffer : public VulkanMemoryManager {
+class VulkanPushBuffer : public GPUMemoryManager {
 	struct BufInfo {
 		VkBuffer buffer;
 		VmaAllocation allocation;
@@ -108,7 +100,7 @@ private:
 // Simple memory pushbuffer pool that can share blocks between the "frames", to reduce the impact of push memory spikes -
 // a later frame can gobble up redundant buffers from an earlier frame even if they don't share frame index.
 // NOT thread safe! Can only be used from one thread (our main thread).
-class VulkanPushPool : public VulkanMemoryManager {
+class VulkanPushPool : public GPUMemoryManager {
 public:
 	VulkanPushPool(VulkanContext *vulkan, const char *name, size_t originalBlockSize, VkBufferUsageFlags usage);
 	~VulkanPushPool();
@@ -212,5 +204,3 @@ private:
 	bool grow_;
 };
 
-std::vector<VulkanMemoryManager *> GetActiveVulkanMemoryManagers();
-