qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Fix some forward declarations and namespace issues

Browse source
This commit is contained in:
Bill Currie 2023-01-30 13:19:53 +09:00
parent b08639fc82
commit 477057a5ad
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/Vulkan/command.h
View file

@ -49,7 +49,7 @@ int QFV_QueueSubmit (struct qfv_queue_s *queue,
qfv_semaphoreset_t *signalSemaphores, VkFence fence); qfv_semaphoreset_t *signalSemaphores, VkFence fence);
int QFV_QueueWaitIdle (struct qfv_queue_s *queue); int QFV_QueueWaitIdle (struct qfv_queue_s *queue);
typedef struct { typedef struct qfv_push_constants_s {
VkShaderStageFlags stageFlags; VkShaderStageFlags stageFlags;
uint32_t offset; uint32_t offset;
uint32_t size; uint32_t size;

16
include/QF/Vulkan/debug.h
View file

@ -25,10 +25,10 @@
do { \ do { \
qfv_devfuncs_t *dfunc = device->funcs; \ qfv_devfuncs_t *dfunc = device->funcs; \
if (dfunc->vkCmdBeginDebugUtilsLabelEXT) { \ if (dfunc->vkCmdBeginDebugUtilsLabelEXT) { \
VkDebugUtilsLabelEXT label = { \ VkDebugUtilsLabelEXT qfv_du_label = { \
VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \ VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
}; \ }; \
dfunc->vkCmdBeginDebugUtilsLabelEXT (cmd, &label); \ dfunc->vkCmdBeginDebugUtilsLabelEXT (cmd, &qfv_du_label); \
} \ } \
} while (0) } while (0)
@ -44,10 +44,10 @@
do { \ do { \
qfv_devfuncs_t *dfunc = device->funcs; \ qfv_devfuncs_t *dfunc = device->funcs; \
if (dfunc->vkCmdInsertDebugUtilsLabelEXT) { \ if (dfunc->vkCmdInsertDebugUtilsLabelEXT) { \
VkDebugUtilsLabelEXT label = { \ VkDebugUtilsLabelEXT qfv_du_label = { \
VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \ VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
}; \ }; \
dfunc->vkCmdInsertDebugUtilsLabelEXT (cmd, &label); \ dfunc->vkCmdInsertDebugUtilsLabelEXT (cmd, &qfv_du_label); \
} \ } \
} while (0) } while (0)
@ -74,10 +74,10 @@
do { \ do { \
qfv_devfuncs_t *dfunc = device->funcs; \ qfv_devfuncs_t *dfunc = device->funcs; \
if (dfunc->vkQueueBeginDebugUtilsLabelEXT) { \ if (dfunc->vkQueueBeginDebugUtilsLabelEXT) { \
VkDebugUtilsLabelEXT label = { \ VkDebugUtilsLabelEXT qfv_du_label = { \
VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \ VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
}; \ }; \
dfunc->vkQueueBeginDebugUtilsLabelEXT (queue, &label); \ dfunc->vkQueueBeginDebugUtilsLabelEXT (queue, &qfv_du_label); \
} \ } \
} while (0) } while (0)
@ -93,10 +93,10 @@
do { \ do { \
qfv_devfuncs_t *dfunc = device->funcs; \ qfv_devfuncs_t *dfunc = device->funcs; \
if (dfunc->vkQueueInsertDebugUtilsLabelEXT) { \ if (dfunc->vkQueueInsertDebugUtilsLabelEXT) { \
VkDebugUtilsLabelEXT label = { \ VkDebugUtilsLabelEXT qfv_du_label = { \
VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \ VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
}; \ }; \
dfunc->vkQueueInsertDebugUtilsLabelEXT (queue, &label); \ dfunc->vkQueueInsertDebugUtilsLabelEXT (queue, &qfv_du_label); \
} \ } \
} while (0) } while (0)

1
include/vid_vulkan.h
View file

@ -7,6 +7,7 @@
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include "QF/darray.h" #include "QF/darray.h"
#include "QF/qtypes.h"
#include "QF/simd/types.h" #include "QF/simd/types.h"
typedef struct vulkan_frame_s { typedef struct vulkan_frame_s {