Implement mem mapping and buffer/image copying

include/QF/Vulkan/command.h

@@ -90,4 +90,22 @@ void QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 							 struct qfv_bufferbarrierset_s *buffBarriers,
 							 struct qfv_imagebarrierset_s *imgBarriers);
 
+struct qfv_buffer_s;
+struct qfv_image_s;
+void QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
+						struct qfv_buffer_s *src, struct qfv_buffer_s *dst,
+						VkBufferCopy *regions, uint32_t numRegions);
+void QFV_CmdCopyBufferToImage (qfv_cmdbuffer_t *cmdBuffer,
+							   struct qfv_buffer_s *src,
+							   struct qfv_image_s *dst,
+							   VkImageLayout layout,
+							   VkBufferImageCopy *regions,
+							   uint32_t numRegions);
+void QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
+							   struct qfv_image_s *src,
+							   VkImageLayout layout,
+							   struct qfv_buffer_s *dst,
+							   VkBufferImageCopy *regions,
+							   uint32_t numRegions);
+
 #endif//__QF_Vulkan_command_h

include/QF/Vulkan/funclist.h

@@ -118,7 +118,14 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkGetImageMemoryRequirements)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkBindImageMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImageView)
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkMapMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkUnmapMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkFlushMappedMemoryRanges)
+
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImageToBuffer)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 

include/QF/Vulkan/memory.h

@@ -6,4 +6,15 @@ typedef struct qfv_memory_s {
 	VkDeviceMemory object;
 } qfv_memory_t;
 
+typedef struct qfv_mappedmemrange_s {
+	qfv_memory_t *memory;
+	VkDeviceSize offset;
+	VkDeviceSize size;
+} qfv_mappedmemrange_t;
+
+void *QFV_MapMemory (qfv_memory_t *memory,
+					 VkDeviceSize offset, VkDeviceSize size);
+void QFV_UnmapMemory (qfv_memory_t *memory);
+void QFV_FlushMemory (qfv_mappedmemrange_t *ranges, uint32_t numRanges);
+
 #endif//__QF_Vulkan_memory_h

libs/video/renderer/vulkan/Makefile.am

@@ -9,6 +9,7 @@ vulkan_src = \
 	device.c \
 	image.c \
 	instance.c \
+	memory.c \
 	swapchain.c \
 	util.c \
 	vulkan_draw.c \

libs/video/renderer/vulkan/command.c

@@ -422,3 +422,43 @@ QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 								  numBuffBarriers, buffBarriers,
 								  numImgBarriers, imgBarriers);
 }
+
+void
+QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
+				   struct qfv_buffer_s *src, struct qfv_buffer_s *dst,
+				   VkBufferCopy *regions, uint32_t numRegions)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdCopyBuffer (cmdBuffer->buffer, src->buffer, dst->buffer,
+							numRegions, regions);
+}
+
+void
+QFV_CmdCopyBufferToImage (qfv_cmdbuffer_t *cmdBuffer,
+						  struct qfv_buffer_s *src,
+						  struct qfv_image_s *dst,
+						  VkImageLayout layout,
+						  VkBufferImageCopy *regions, uint32_t numRegions)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdCopyBufferToImage (cmdBuffer->buffer, src->buffer, dst->image,
+								   layout, numRegions, regions);
+}
+
+void
+QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
+						  struct qfv_image_s *src,
+						  VkImageLayout layout,
+						  struct qfv_buffer_s *dst,
+						  VkBufferImageCopy *regions, uint32_t numRegions)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdCopyImageToBuffer (cmdBuffer->buffer, src->image, layout,
+								   dst->buffer, numRegions, regions);
+}

libs/video/renderer/vulkan/memory.c

@@ -0,0 +1,102 @@
+/*
+	memory.c
+
+	Vulkan memory functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/memory.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+void *
+QFV_MapMemory (qfv_memory_t *memory, VkDeviceSize offset, VkDeviceSize size)
+{
+	qfv_device_t *device = memory->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	void       *map = 0;
+
+	dfunc->vkMapMemory (dev, memory->object, offset, size, 0, &map);
+	return map;
+}
+
+void
+QFV_UnmapMemory (qfv_memory_t *memory)
+{
+	qfv_device_t *device = memory->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkUnmapMemory (dev, memory->object);
+}
+
+void
+QFV_FlushMemory (qfv_mappedmemrange_t *flushRanges, uint32_t numFlushRanges)
+{
+	qfv_device_t *device = flushRanges[0].memory->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkMappedMemoryRange *ranges = alloca(sizeof (*ranges) * numFlushRanges);
+
+	for (uint32_t i = 0; i < numFlushRanges; i++) {
+		ranges[i].sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+		ranges[i].pNext = 0;
+		ranges[i].memory = flushRanges[i].memory->object;
+		ranges[i].offset = flushRanges[i].offset;
+		ranges[i].size = flushRanges[i].size;
+	}
+	dfunc->vkFlushMappedMemoryRanges (dev, numFlushRanges, ranges);
+}