qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-04 00:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Switch around renderpass and subpass names

Browse source 
The old structs will go away eventually, and I'm tired of seeing that _
tail.
This commit is contained in:
Bill Currie 2023-06-15 13:13:52 +09:00
parent 8ff60b4603
commit 97f9fd81d6
12 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,7 @@ typedef struct lightingctx_s {
qfv_imageset_t light_images;
light_renderer_set_t light_renderers;
qfv_renderpass_t *qfv_renderpass;
qfv_orenderpass_t *qfv_renderpass;
VkRenderPass renderpass_6;
VkRenderPass renderpass_4;
VkRenderPass renderpass_1;

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

@ -17,21 +17,21 @@ typedef struct qfv_framebufferset_s
#define QFV_AllocFrameBuffers(num, allocator) \
DARRAY_ALLOCFIXED (qfv_framebufferset_t, num, allocator)
typedef struct qfv_subpass_s {
typedef struct qfv_osubpass_s {
vec4f_t color;
const char *name;
} qfv_subpass_t;
} qfv_osubpass_t;
typedef struct qfv_subpassset_s
DARRAY_TYPE (qfv_subpass_t) qfv_subpassset_t;
DARRAY_TYPE (qfv_osubpass_t) qfv_subpassset_t;
typedef struct qfv_renderframe_s {
struct vulkan_ctx_s *vulkan_ctx;
struct qfv_renderpass_s *renderpass;
struct qfv_orenderpass_s *renderpass;
VkSubpassContents subpassContents;
VkFramebuffer framebuffer;
int subpassCount;
qfv_subpass_t *subpassInfo;
qfv_osubpass_t *subpassInfo;
struct qfv_cmdbufferset_s *subpassCmdSets;
} qfv_renderframe_t;
@ -43,7 +43,7 @@ typedef struct clearvalueset_s
typedef void (*qfv_draw_t) (qfv_renderframe_t *rFrame);
typedef struct qfv_renderpass_s {
typedef struct qfv_orenderpass_s {
struct vulkan_ctx_s *vulkan_ctx;
vec4f_t color; // for debugging
const char *name; // for debugging
@ -67,14 +67,14 @@ typedef struct qfv_renderpass_s {
qfv_renderframeset_t frames;
qfv_draw_t draw;
} qfv_renderpass_t;
} qfv_orenderpass_t;
qfv_renderpass_t *QFV_RenderPass_New (struct vulkan_ctx_s *ctx,
qfv_orenderpass_t *QFV_RenderPass_New (struct vulkan_ctx_s *ctx,
const char *name, qfv_draw_t draw);
void QFV_RenderPass_Delete (qfv_renderpass_t *renderpass);
void QFV_RenderPass_CreateAttachments (qfv_renderpass_t *renderpass);
void QFV_RenderPass_CreateRenderPass (qfv_renderpass_t *renderpass);
void QFV_RenderPass_CreateFramebuffer (qfv_renderpass_t *renderpass);
void QFV_RenderPass_Delete (qfv_orenderpass_t *renderpass);
void QFV_RenderPass_CreateAttachments (qfv_orenderpass_t *renderpass);
void QFV_RenderPass_CreateRenderPass (qfv_orenderpass_t *renderpass);
void QFV_RenderPass_CreateFramebuffer (qfv_orenderpass_t *renderpass);
#endif//__QF_Vulkan_qf_renderpass_h

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

@ -279,15 +279,15 @@ typedef struct qfv_pipeline_s {
qfv_taskinfo_t *tasks;
} qfv_pipeline_t;
typedef struct qfv_subpass_s_ {
typedef struct qfv_subpass_s {
qfv_label_t label;
VkCommandBufferInheritanceInfo inherit;
VkCommandBufferBeginInfo beginInfo;
uint32_t pipeline_count;
qfv_pipeline_t *pipelines;
} qfv_subpass_t_;
} qfv_subpass_t;
typedef struct qfv_renderpass_s_ {
typedef struct qfv_renderpass_s {
struct vulkan_ctx_s *vulkan_ctx;
qfv_label_t label; // for debugging
@ -301,13 +301,13 @@ typedef struct qfv_renderpass_s_ {
//qfv_output_t output;
uint32_t subpass_count;
qfv_subpass_t_ *subpasses;
} qfv_renderpass_t_;
qfv_subpass_t *subpasses;
} qfv_renderpass_t;
typedef struct qfv_render_s {
qfv_label_t label;
qfv_renderpass_t_ *active;
qfv_renderpass_t_ *renderpasses;
qfv_renderpass_t *active;
qfv_renderpass_t *renderpasses;
uint32_t num_renderpasses;
} qfv_render_t;

4
include/vid_vulkan.h
View file

@ -21,7 +21,7 @@ typedef struct vulkan_frameset_s
DARRAY_TYPE (vulkan_frame_t) vulkan_frameset_t;
typedef struct qfv_renderpassset_s
DARRAY_TYPE (struct qfv_renderpass_s *) qfv_renderpassset_t;
DARRAY_TYPE (struct qfv_orenderpass_s *) qfv_renderpassset_t;
typedef struct vulkan_ctx_s {
void (*load_vulkan) (struct vulkan_ctx_s *ctx);
@ -67,7 +67,7 @@ typedef struct vulkan_ctx_s {
uint32_t curFrame;
vulkan_frameset_t frames;
qfv_renderpassset_t renderPasses;
struct qfv_renderpass_s *output_renderpass;
struct qfv_orenderpass_s *output_renderpass;
struct qfv_capture_s *capture;
void (*capture_callback) (const byte *data, int width, int height);

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

@ -111,7 +111,7 @@ run_pipeline (qfv_pipeline_t *pipeline, VkCommandBuffer cmd, vulkan_ctx_t *ctx)
// https://themaister.net/blog/2019/08/14/yet-another-blog-explaining-vulkan-synchronization/
static void
run_subpass (qfv_subpass_t_ *sp, VkCommandBuffer cmd, vulkan_ctx_t *ctx)
run_subpass (qfv_subpass_t *sp, VkCommandBuffer cmd, vulkan_ctx_t *ctx)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
@ -130,7 +130,7 @@ run_subpass (qfv_subpass_t_ *sp, VkCommandBuffer cmd, vulkan_ctx_t *ctx)
}
static void
run_renderpass (qfv_renderpass_t_ *rp, vulkan_ctx_t *ctx)
run_renderpass (qfv_renderpass_t *rp, vulkan_ctx_t *ctx)
{
printf ("run_renderpass: %s\n", rp->label.name);
@ -836,9 +836,9 @@ typedef struct {
qfv_render_t *renders;
qfv_compute_t *computes;
qfv_process_t *processes;
qfv_renderpass_t_ *renderpasses;
qfv_renderpass_t *renderpasses;
VkClearValue *clearvalues;
qfv_subpass_t_ *subpasses;
qfv_subpass_t *subpasses;
qfv_pipeline_t *pipelines;
qfv_taskinfo_t *tasks;
VkDescriptorSet *descriptorsets;
@ -874,11 +874,11 @@ init_pipeline (qfv_pipeline_t *pl, qfv_pipelineinfo_t *plinfo,
}
static void
init_subpass (qfv_subpass_t_ *sp, qfv_subpassinfo_t *isp,
init_subpass (qfv_subpass_t *sp, qfv_subpassinfo_t *isp,
jobptr_t *jp, objstate_t *s)
{
uint32_t np = s->inds.num_graph_pipelines + s->inds.num_comp_pipelines;
*sp = (qfv_subpass_t_) {
*sp = (qfv_subpass_t) {
.label = {
.name = isp->name,
.color = isp->color,
@ -902,10 +902,10 @@ init_subpass (qfv_subpass_t_ *sp, qfv_subpassinfo_t *isp,
}
static void
init_renderpass (qfv_renderpass_t_ *rp, qfv_renderpassinfo_t *rpinfo,
init_renderpass (qfv_renderpass_t *rp, qfv_renderpassinfo_t *rpinfo,
jobptr_t *jp, objstate_t *s)
{
*rp = (qfv_renderpass_t_) {
*rp = (qfv_renderpass_t) {
.vulkan_ctx = s->ctx,
.label.name = rpinfo->name,
.label.color = rpinfo->color,
@ -1019,9 +1019,9 @@ init_job (vulkan_ctx_t *ctx, objcount_t *counts, objstate_t s)
size += counts->num_render * sizeof (qfv_render_t);
size += counts->num_compute * sizeof (qfv_compute_t);
size += counts->num_process * sizeof (qfv_process_t);
size += counts->num_renderpasses * sizeof (qfv_renderpass_t_);
size += counts->num_renderpasses * sizeof (qfv_renderpass_t);
size += counts->num_attachments * sizeof (VkClearValue);
size += counts->num_subpasses * sizeof (qfv_subpass_t_);
size += counts->num_subpasses * sizeof (qfv_subpass_t);
size += counts->num_graph_pipelines * sizeof (qfv_pipeline_t);
size += counts->num_comp_pipelines * sizeof (qfv_pipeline_t);
size += counts->num_tasks * sizeof (qfv_taskinfo_t);
@ -1044,9 +1044,9 @@ init_job (vulkan_ctx_t *ctx, objcount_t *counts, objstate_t s)
__auto_type rn = (qfv_render_t *) &job->steps[job->num_steps];
__auto_type cp = (qfv_compute_t *) &rn[counts->num_render];
__auto_type pr = (qfv_process_t *) &cp[counts->num_compute];
__auto_type rp = (qfv_renderpass_t_ *) &pr[counts->num_process];
__auto_type rp = (qfv_renderpass_t *) &pr[counts->num_process];
__auto_type cv = (VkClearValue *) &rp[counts->num_renderpasses];
__auto_type sp = (qfv_subpass_t_ *) &cv[counts->num_attachments];
__auto_type sp = (qfv_subpass_t *) &cv[counts->num_attachments];
__auto_type pl = (qfv_pipeline_t *) &sp[counts->num_subpasses];
__auto_type ti = (qfv_taskinfo_t *) &pl[job->num_pipelines];
__auto_type ds = (VkDescriptorSet *) &ti[counts->num_tasks];

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

@ -7,7 +7,7 @@ typedef vec4 vec4f_t;
//FIXME copy of qfv_subpass_t in qf_renderpass.h
//except it doesn't really matter because a custom spec is used
typedef struct qfv_subpass_s {
typedef struct qfv_osubpass_s {
vec4 color;
string name;
} qfv_subpass_t;
} qfv_osubpass_t;

4
libs/video/renderer/vulkan/vkparse.c
View file

@ -1735,9 +1735,9 @@ parse_subpassset (const plfield_t *field, const plitem_t *item, void *data,
{
plelement_t element = {
QFDictionary,
sizeof (qfv_subpass_t),
sizeof (qfv_osubpass_t),
vkparse_alloc,
parse_qfv_subpass_t,
parse_qfv_osubpass_t,
0,
};
plfield_t f = { 0, 0, 0, 0, &element };

6
libs/video/renderer/vulkan/vkparse.plist
View file

@ -30,7 +30,7 @@ search = (
VkRenderPassCreateInfo,
VkRenderPassMultiviewCreateInfo,
qfv_subpass_t,
qfv_osubpass_t,
qfv_output_t,
qfv_descriptorsetlayoutinfo_t,
@ -403,8 +403,8 @@ parse = {
};
};
qfv_subpass_s = {
.name = qfv_subpass_t;
qfv_osubpass_s = {
.name = qfv_osubpass_t;
color = {
type = (custom, QFString, parse_RGBA);
fields = (color);

2
libs/video/renderer/vulkan/vulkan_compose.c
View file

@ -63,7 +63,7 @@ Vulkan_Compose_Draw (qfv_renderframe_t *rFrame)
vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
qfv_renderpass_t *renderpass = rFrame->renderpass;
qfv_orenderpass_t *renderpass = rFrame->renderpass;
composectx_t *cctx = ctx->compose_context;
composeframe_t *cframe = &cctx->frames.a[ctx->curFrame];

2
libs/video/renderer/vulkan/vulkan_lighting.c
View file

@ -153,7 +153,7 @@ Vulkan_Lighting_Draw (qfv_renderframe_t *rFrame)
vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
qfv_renderpass_t *renderpass = rFrame->renderpass;
qfv_orenderpass_t *renderpass = rFrame->renderpass;
lightingctx_t *lctx = ctx->lighting_context;
if (!lctx->scene) {

22
libs/video/renderer/vulkan/vulkan_renderpass.c
View file

@ -43,7 +43,7 @@
#include "vkparse.h"
static plitem_t *
get_rp_item (vulkan_ctx_t *ctx, qfv_renderpass_t *rp, const char *name)
get_rp_item (vulkan_ctx_t *ctx, qfv_orenderpass_t *rp, const char *name)
{
rp->renderpassDef = Vulkan_GetConfig (ctx, rp->name);
@ -72,7 +72,7 @@ get_image_size (VkImage image, qfv_device_t *device)
}
static void
destroy_framebuffers (vulkan_ctx_t *ctx, qfv_renderpass_t *rp)
destroy_framebuffers (vulkan_ctx_t *ctx, qfv_orenderpass_t *rp)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
@ -85,7 +85,7 @@ destroy_framebuffers (vulkan_ctx_t *ctx, qfv_renderpass_t *rp)
}
void
QFV_RenderPass_CreateAttachments (qfv_renderpass_t *renderpass)
QFV_RenderPass_CreateAttachments (qfv_orenderpass_t *renderpass)
{
vulkan_ctx_t *ctx = renderpass->vulkan_ctx;
qfv_device_t *device = ctx->device;
@ -195,7 +195,7 @@ QFV_RenderPass_CreateAttachments (qfv_renderpass_t *renderpass)
}
void
QFV_RenderPass_CreateRenderPass (qfv_renderpass_t *renderpass)
QFV_RenderPass_CreateRenderPass (qfv_orenderpass_t *renderpass)
{
vulkan_ctx_t *ctx = renderpass->vulkan_ctx;
__auto_type rp = renderpass;
@ -228,7 +228,7 @@ QFV_RenderPass_CreateRenderPass (qfv_renderpass_t *renderpass)
}
void
QFV_RenderPass_CreateFramebuffer (qfv_renderpass_t *renderpass)
QFV_RenderPass_CreateFramebuffer (qfv_orenderpass_t *renderpass)
{
vulkan_ctx_t *ctx = renderpass->vulkan_ctx;
__auto_type rp = renderpass;
@ -256,7 +256,7 @@ QFV_RenderPass_CreateFramebuffer (qfv_renderpass_t *renderpass)
}
static void
init_renderframe (vulkan_ctx_t *ctx, qfv_renderpass_t *rp,
init_renderframe (vulkan_ctx_t *ctx, qfv_orenderpass_t *rp,
qfv_renderframe_t *rFrame)
{
rFrame->vulkan_ctx = ctx;
@ -276,7 +276,7 @@ init_renderframe (vulkan_ctx_t *ctx, qfv_renderpass_t *rp,
}
static void
destroy_attachments (vulkan_ctx_t *ctx, qfv_renderpass_t *rp)
destroy_attachments (vulkan_ctx_t *ctx, qfv_orenderpass_t *rp)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
@ -308,7 +308,7 @@ destroy_attachments (vulkan_ctx_t *ctx, qfv_renderpass_t *rp)
}
static void
destroy_renderframes (vulkan_ctx_t *ctx, qfv_renderpass_t *rp)
destroy_renderframes (vulkan_ctx_t *ctx, qfv_orenderpass_t *rp)
{
for (size_t i = 0; i < rp->frames.size; i++) {
__auto_type rFrame = &rp->frames.a[i];
@ -319,10 +319,10 @@ destroy_renderframes (vulkan_ctx_t *ctx, qfv_renderpass_t *rp)
}
}
qfv_renderpass_t *
qfv_orenderpass_t *
QFV_RenderPass_New (vulkan_ctx_t *ctx, const char *name, qfv_draw_t function)
{
qfv_renderpass_t *rp = calloc (1, sizeof (qfv_renderpass_t));
qfv_orenderpass_t *rp = calloc (1, sizeof (qfv_orenderpass_t));
rp->vulkan_ctx = ctx;
rp->name = name;
rp->draw = function;
@ -361,7 +361,7 @@ QFV_RenderPass_New (vulkan_ctx_t *ctx, const char *name, qfv_draw_t function)
}
void
QFV_RenderPass_Delete (qfv_renderpass_t *renderpass)
QFV_RenderPass_Delete (qfv_orenderpass_t *renderpass)
{
vulkan_ctx_t *ctx = renderpass->vulkan_ctx;
qfv_device_t *device = ctx->device;

6
libs/video/renderer/vulkan/vulkan_vid_common.c
View file

@ -190,8 +190,8 @@ Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
static int
renderpass_cmp (const void *_a, const void *_b)
{
__auto_type a = (const qfv_renderpass_t **) _a;
__auto_type b = (const qfv_renderpass_t **) _b;
__auto_type a = (const qfv_orenderpass_t **) _a;
__auto_type b = (const qfv_orenderpass_t **) _b;
return (*a)->order - (*b)->order;
}
@ -205,7 +205,7 @@ Vulkan_CreateRenderPasses (vulkan_ctx_t *ctx)
Vulkan_Translucent_CreateRenderPasses (ctx);
heapsort (ctx->renderPasses.a, ctx->renderPasses.size,
sizeof (qfv_renderpass_t *), renderpass_cmp);
sizeof (qfv_orenderpass_t *), renderpass_cmp);
}
void