From 477057a5ada9137c506c839ceac6b2d2a1d2d286 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Jan 2023 13:19:53 +0900
Subject: [PATCH] [vulkan] Fix some forward declarations and namespace issues

---
 include/QF/Vulkan/command.h |  2 +-
 include/QF/Vulkan/debug.h   | 16 ++++++++--------
 include/vid_vulkan.h        |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 452baa9ca..4820eb141 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -49,7 +49,7 @@ int QFV_QueueSubmit (struct qfv_queue_s *queue,
 					 qfv_semaphoreset_t *signalSemaphores, VkFence fence);
 int QFV_QueueWaitIdle (struct qfv_queue_s *queue);
 
-typedef struct {
+typedef struct qfv_push_constants_s {
 	VkShaderStageFlags stageFlags;
 	uint32_t    offset;
 	uint32_t    size;
diff --git a/include/QF/Vulkan/debug.h b/include/QF/Vulkan/debug.h
index 200d2aab2..d9029eab6 100644
--- a/include/QF/Vulkan/debug.h
+++ b/include/QF/Vulkan/debug.h
@@ -25,10 +25,10 @@
 	do { \
 		qfv_devfuncs_t *dfunc = device->funcs; \
 		if (dfunc->vkCmdBeginDebugUtilsLabelEXT) { \
-			VkDebugUtilsLabelEXT label = { \
+			VkDebugUtilsLabelEXT qfv_du_label = { \
 				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
 			}; \
-			dfunc->vkCmdBeginDebugUtilsLabelEXT (cmd, &label); \
+			dfunc->vkCmdBeginDebugUtilsLabelEXT (cmd, &qfv_du_label); \
 		} \
 	} while (0)
 
@@ -44,10 +44,10 @@
 	do { \
 		qfv_devfuncs_t *dfunc = device->funcs; \
 		if (dfunc->vkCmdInsertDebugUtilsLabelEXT) { \
-			VkDebugUtilsLabelEXT label = { \
+			VkDebugUtilsLabelEXT qfv_du_label = { \
 				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
 			}; \
-			dfunc->vkCmdInsertDebugUtilsLabelEXT (cmd, &label); \
+			dfunc->vkCmdInsertDebugUtilsLabelEXT (cmd, &qfv_du_label); \
 		} \
 	} while (0)
 
@@ -74,10 +74,10 @@
 	do { \
 		qfv_devfuncs_t *dfunc = device->funcs; \
 		if (dfunc->vkQueueBeginDebugUtilsLabelEXT) { \
-			VkDebugUtilsLabelEXT label = { \
+			VkDebugUtilsLabelEXT qfv_du_label = { \
 				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
 			}; \
-			dfunc->vkQueueBeginDebugUtilsLabelEXT (queue, &label); \
+			dfunc->vkQueueBeginDebugUtilsLabelEXT (queue, &qfv_du_label); \
 		} \
 	} while (0)
 
@@ -93,10 +93,10 @@
 	do { \
 		qfv_devfuncs_t *dfunc = device->funcs; \
 		if (dfunc->vkQueueInsertDebugUtilsLabelEXT) { \
-			VkDebugUtilsLabelEXT label = { \
+			VkDebugUtilsLabelEXT qfv_du_label = { \
 				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
 			}; \
-			dfunc->vkQueueInsertDebugUtilsLabelEXT (queue, &label); \
+			dfunc->vkQueueInsertDebugUtilsLabelEXT (queue, &qfv_du_label); \
 		} \
 	} while (0)
 
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 19d8ac3be..2a9936a99 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -7,6 +7,7 @@
 #include <vulkan/vulkan.h>
 
 #include "QF/darray.h"
+#include "QF/qtypes.h"
 #include "QF/simd/types.h"
 
 typedef struct vulkan_frame_s {