diff --git a/include/QF/Vulkan/qf_renderpass.h b/include/QF/Vulkan/qf_renderpass.h index 7528517ad..7f9d6961e 100644 --- a/include/QF/Vulkan/qf_renderpass.h +++ b/include/QF/Vulkan/qf_renderpass.h @@ -9,6 +9,8 @@ #include "QF/darray.h" #include "QF/simd/types.h" +#include "QF/Vulkan/render.h" + typedef struct qfv_framebufferset_s DARRAY_TYPE (VkFramebuffer) qfv_framebufferset_t; @@ -41,16 +43,6 @@ typedef struct clearvalueset_s typedef void (*qfv_draw_t) (qfv_renderframe_t *rFrame); -typedef struct qfv_output_s { - VkExtent2D extent; - VkImage image; // only if owned - VkImageView view; - VkFormat format; - uint32_t frames; - VkImageView *view_list; // per frame - VkImageLayout finalLayout; -} qfv_output_t; - typedef struct qfv_renderpass_s { struct vulkan_ctx_s *vulkan_ctx; vec4f_t color; // for debugging diff --git a/include/QF/Vulkan/render.h b/include/QF/Vulkan/render.h index e0cc7d624..565f91f4a 100644 --- a/include/QF/Vulkan/render.h +++ b/include/QF/Vulkan/render.h @@ -9,6 +9,16 @@ #include "QF/cexpr.h" #include "QF/simd/types.h" +typedef struct qfv_output_s { + VkExtent2D extent; + VkImage image; // only if owned + VkImageView view; + VkFormat format; + uint32_t frames; + VkImageView *view_list; // per frame + VkImageLayout finalLayout; +} qfv_output_t; + typedef struct qfv_reference_s { const char *name; int line; diff --git a/libs/video/renderer/vulkan/render.c b/libs/video/renderer/vulkan/render.c index 488db0eb8..3b269bf12 100644 --- a/libs/video/renderer/vulkan/render.c +++ b/libs/video/renderer/vulkan/render.c @@ -46,7 +46,6 @@ #include "QF/Vulkan/pipeline.h" #include "vid_vulkan.h" -#include "QF/Vulkan/qf_renderpass.h"//FIXME #include "vkparse.h" static void diff --git a/libs/video/renderer/vulkan/vkgen/vulkan.r b/libs/video/renderer/vulkan/vkgen/vulkan.r index c40e48098..0ac44aeda 100644 --- a/libs/video/renderer/vulkan/vkgen/vulkan.r +++ b/libs/video/renderer/vulkan/vkgen/vulkan.r @@ -11,15 +11,3 @@ typedef struct qfv_subpass_s { vec4 color; string name; } qfv_subpass_t; - -//FIXME copy of qfv_output_t in qf_renderpass.h -//except it doesn't really matter because a custom spec is used -typedef struct qfv_output_s { - VkExtent2D extent; - VkImage image; - VkImageView view; - VkFormat format; - uint32_t frames; - VkImageView *view_list; - VkImageLayout finalLayout; -} qfv_output_t;