From 2adb5f008c289d533d1d2310d7fade2206153144 Mon Sep 17 00:00:00 2001
From: Jonathan Bradley <jcb@pikum.xyz>
Date: Wed, 29 Jan 2025 20:07:31 -0500
Subject: pke: refactor: reduce image resource var ambiguity

---
 src/window.hpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/window.hpp')

diff --git a/src/window.hpp b/src/window.hpp
index 01c46cf..34398c4 100644
--- a/src/window.hpp
+++ b/src/window.hpp
@@ -25,12 +25,6 @@ extern VkSurfaceKHR vkSurfaceKHR;
 extern VkFormat depthFormat;
 extern VkDevice vkDevice;
 extern VkAllocationCallbacks *vkAllocator;
-extern VkQueue graphicsQueue;
-extern VkCommandPool graphicsCommandPool;
-extern VkCommandBuffer graphicsCommandBuffer;
-extern VkQueue transferQueue;
-extern VkCommandPool transferCommandPool;
-extern VkCommandBuffer transferCommandBuffer;
 extern unsigned int graphicsFamilyIndex;
 extern unsigned int presentFamilyIndex;
 extern unsigned int transferFamilyIndex;
@@ -99,7 +93,15 @@ void Render();
 
 unsigned int FindMemoryTypeIndex(uint32_t typeFilter, VkMemoryPropertyFlags memPropertyFlags);
 void CalculateCombinedMemReqs(uint64_t memReqsCount, VkMemoryRequirements *memReqs, VkMemoryRequirements &combinedMemReqs);
-void BeginTransferBuffer(VkDeviceSize requestedMemorySize, VkBuffer &buffer, VkDeviceMemory &deviceMemory, void *&deviceData);
-void EndTransferBuffer(VkBuffer &buffer, VkDeviceMemory &deviceMemory);
+
+struct PKVK_TmpBufferDetails {
+	VkQueue queue = VK_NULL_HANDLE;
+	VkCommandBuffer cmdBuffer = VK_NULL_HANDLE;
+	VkBuffer buffer = VK_NULL_HANDLE;
+	VkDeviceMemory deviceMemory = VK_NULL_HANDLE;
+	void *deviceData = nullptr;
+};
+void PKVK_BeginBuffer(unsigned int family_index, VkDeviceSize requestedMemorySize, PKVK_TmpBufferDetails &tmpBufferDetails);
+void PKVK_EndBuffer(PKVK_TmpBufferDetails &tmpBufferDetails);
 
 #endif /* PKE_WINDOW_HPP */
-- 
cgit v1.2.3