qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-12 06:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Clean up some bsp pass name confusion

Browse source 
I had gotten stage and pass confused at some stage. Also, name the
passes in C (enum).
This commit is contained in:
Bill Currie 2023-08-08 19:02:39 +09:00
parent a5fcc41d08
commit 5bc1924a25
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/QF/Vulkan/qf_bsp.h
View file

@ -325,6 +325,13 @@ typedef enum {
QFV_bspNumPasses QFV_bspNumPasses
} QFV_BspQueue; } QFV_BspQueue;
typedef enum {
QFV_bspMain,
QFV_bspShadow,
QFV_bspNumStages
} QFV_BspPass;
typedef struct bspframe_s { typedef struct bspframe_s {
uint32_t *index_data; // pointer into mega-buffer for this frame (c) uint32_t *index_data; // pointer into mega-buffer for this frame (c)
uint32_t index_offset; // offset of index_data within mega-buffer (c) uint32_t index_offset; // offset of index_data within mega-buffer (c)

35
libs/video/renderer/vulkan/vulkan_bsp.c
View file

@ -1193,7 +1193,7 @@ bsp_draw_queue (const exprval_t **params, exprval_t *result, exprctx_t *ectx)
} }
// params are in reverse order // params are in reverse order
auto pass_ind = *(int *) params[2]->value; auto pass_ind = *(QFV_BspPass *) params[2]->value;
auto queue = *(QFV_BspQueue *) params[1]->value; auto queue = *(QFV_BspQueue *) params[1]->value;
auto stage = *(int *) params[0]->value; auto stage = *(int *) params[0]->value;
@ -1246,7 +1246,7 @@ bsp_visit_world (const exprval_t **params, exprval_t *result, exprctx_t *ectx)
auto taskctx = (qfv_taskctx_t *) ectx; auto taskctx = (qfv_taskctx_t *) ectx;
auto ctx = taskctx->ctx; auto ctx = taskctx->ctx;
auto bctx = ctx->bsp_context; auto bctx = ctx->bsp_context;
auto pass_ind = *(int *) params[0]->value; auto pass_ind = *(QFV_BspPass *) params[0]->value;
auto pass = pass_ind ? &bctx->shadow_pass : &bctx->main_pass; auto pass = pass_ind ? &bctx->shadow_pass : &bctx->main_pass;
@ -1302,23 +1302,26 @@ bsp_visit_world (const exprval_t **params, exprval_t *result, exprctx_t *ectx)
bsp_flush (ctx); bsp_flush (ctx);
} }
static exprenum_t bsp_stage_enum; static exprenum_t bsp_pass_enum;
static exprtype_t bsp_stage_type = { static exprtype_t bsp_pass_type = {
.name = "bsp_stage", .name = "bsp_pass",
.size = sizeof (int), .size = sizeof (int),
.get_string = cexpr_enum_get_string, .get_string = cexpr_enum_get_string,
.data = &bsp_stage_enum, .data = &bsp_pass_enum,
}; };
static int bsp_stage_values[] = { 0, 1, }; static int bsp_pass_values[] = {
static exprsym_t bsp_stage_symbols[] = { QFV_bspMain,
{"main", &bsp_stage_type, bsp_stage_values + 0}, QFV_bspShadow,
{"shadow", &bsp_stage_type, bsp_stage_values + 1}, };
static exprsym_t bsp_pass_symbols[] = {
{"main", &bsp_pass_type, bsp_pass_values + 0},
{"shadow", &bsp_pass_type, bsp_pass_values + 1},
{} {}
}; };
static exprtab_t bsp_stage_symtab = { .symbols = bsp_stage_symbols }; static exprtab_t bsp_pass_symtab = { .symbols = bsp_pass_symbols };
static exprenum_t bsp_stage_enum = { static exprenum_t bsp_pass_enum = {
&bsp_stage_type, &bsp_pass_type,
&bsp_stage_symtab, &bsp_pass_symtab,
}; };
static exprenum_t bsp_queue_enum; static exprenum_t bsp_queue_enum;
@ -1348,13 +1351,13 @@ static exprenum_t bsp_queue_enum = {
}; };
static exprtype_t *bsp_visit_world_params[] = { static exprtype_t *bsp_visit_world_params[] = {
&bsp_stage_type, &bsp_pass_type,
}; };
static exprtype_t *bsp_draw_queue_params[] = { static exprtype_t *bsp_draw_queue_params[] = {
&cexpr_int, &cexpr_int,
&bsp_queue_type, &bsp_queue_type,
&bsp_stage_type, &bsp_pass_type,
}; };
static exprfunc_t bsp_reset_queues_func[] = { static exprfunc_t bsp_reset_queues_func[] = {