fixup: Avoid mixing C++ and C Vulkan types

Author: laanwj

code/graphics/vulkan/VulkanMemory.cpp

@@ -282,7 +282,7 @@ void VulkanMemoryManager::unmapMemory(VulkanAllocation& allocation)
 	allocation.mappedPtr = nullptr;
 }
 
-void VulkanMemoryManager::flushMemory(const VulkanAllocation& allocation, VkDeviceSize offset, VkDeviceSize size)
+void VulkanMemoryManager::flushMemory(const VulkanAllocation& allocation, vk::DeviceSize offset, vk::DeviceSize size)
 {
 	if (!m_initialized || allocation.memory == VK_NULL_HANDLE) {
 		return;
@@ -302,7 +302,7 @@ void VulkanMemoryManager::flushMemory(const VulkanAllocation& allocation, VkDevi
 	m_device.flushMappedMemoryRanges(range);
 }
 
-void VulkanMemoryManager::invalidateMemory(const VulkanAllocation& allocation, VkDeviceSize offset, VkDeviceSize size)
+void VulkanMemoryManager::invalidateMemory(const VulkanAllocation& allocation, vk::DeviceSize offset, vk::DeviceSize size)
 {
 	if (!m_initialized || allocation.memory == VK_NULL_HANDLE) {
 		return;

code/graphics/vulkan/VulkanMemory.h

@@ -14,9 +14,9 @@ class VulkanRenderer;
  * @brief Memory allocation info returned when allocating GPU memory
  */
 struct VulkanAllocation {
-	VkDeviceMemory memory = VK_NULL_HANDLE;
-	VkDeviceSize offset = 0;
-	VkDeviceSize size = 0;
+	vk::DeviceMemory memory = VK_NULL_HANDLE;
+	vk::DeviceSize offset = 0;
+	vk::DeviceSize size = 0;
 	void* mappedPtr = nullptr;  // Non-null if memory is mapped
 	uint32_t memoryTypeIndex = 0;
 	bool dedicated = false;  // True if this is a dedicated allocation
@@ -104,15 +104,15 @@ class VulkanMemoryManager {
 	 * @param offset Offset within the allocation
 	 * @param size Size of the range to flush (VK_WHOLE_SIZE for entire allocation)
 	 */
-	void flushMemory(const VulkanAllocation& allocation, VkDeviceSize offset, VkDeviceSize size);
+	void flushMemory(const VulkanAllocation& allocation, vk::DeviceSize offset, vk::DeviceSize size);
 
 	/**
 	 * @brief Invalidate mapped memory to make GPU writes visible to CPU
 	 * @param allocation The allocation containing the range to invalidate
 	 * @param offset Offset within the allocation
 	 * @param size Size of the range to invalidate (VK_WHOLE_SIZE for entire allocation)
 	 */
-	void invalidateMemory(const VulkanAllocation& allocation, VkDeviceSize offset, VkDeviceSize size);
+	void invalidateMemory(const VulkanAllocation& allocation, vk::DeviceSize offset, vk::DeviceSize size);
 
 	/**
 	 * @brief Get memory statistics