qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 20:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] move qfv_output_t to render.h

Browse source 
The plan is qf_renderpass.h (and vulkan_renderpass.c) will eventually
disappear as they get absorbed by render.[ch].
This commit is contained in:
Bill Currie 2023-02-19 12:31:40 +09:00
parent fd36147749
commit fc06547dd9
4 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/QF/Vulkan/qf_renderpass.h
View file

@ -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

10
include/QF/Vulkan/render.h
View file

@ -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;

1
libs/video/renderer/vulkan/render.c
View file

@ -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

12
libs/video/renderer/vulkan/vkgen/vulkan.r
View file

@ -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;