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

[vulkan] Use per-pass entity queues

Browse source 
While there will be some GPU resources to sort out for multi-pass bsp
processing, I think this is the last piece required before shadow passes
can be implemented.
This commit is contained in:
Bill Currie 2023-06-28 17:57:41 +09:00
parent afa84afc79
commit 3bdc4adb4c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -270,6 +270,7 @@ typedef struct bsp_pass_s {
vec4f_t position; ///< view position
const struct mod_brush_s *brush;///< data for current model
struct bspctx_s *bsp_context; ///< owning bsp context
struct entqueue_s *entqueue; ///< entities to render this pass
/** \name GPU data
*
* The indices to be drawn and the entity ids associated with each draw

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

@ -604,12 +604,13 @@ R_DrawBrushModel (entity_t ent, bsp_pass_t *pass, vulkan_ctx_t *ctx)
}
static inline void
visit_leaf (mleaf_t *leaf)
visit_leaf (bsp_pass_t *pass, mleaf_t *leaf)
{
// since this leaf will be rendered, any entities in the leaf also need
// to be rendered (the bsp tree doubles as an entity cull structure)
if (leaf->efrags)
R_StoreEfrags (leaf->efrags);
for (auto efrag = leaf->efrags; efrag; efrag = efrag->leafnext) {
EntQueue_AddEntity (pass->entqueue, efrag->entity, efrag->queue_num);
}
}
// 1 = back side, 0 = front side
@ -700,7 +701,7 @@ R_VisitWorldNodes (bsp_pass_t *pass, vulkan_ctx_t *ctx)
if (front < 0) {
mleaf_t *leaf = brush->leafs + ~front;
if (leaf->contents != CONTENTS_SOLID) {
visit_leaf (leaf);
visit_leaf (pass, leaf);
}
}
visit_node (pass, node, side);
@ -709,7 +710,7 @@ R_VisitWorldNodes (bsp_pass_t *pass, vulkan_ctx_t *ctx)
if (node_id < 0) {
mleaf_t *leaf = brush->leafs + ~node_id;
if (leaf->contents != CONTENTS_SOLID) {
visit_leaf (leaf);
visit_leaf (pass, leaf);
}
}
if (node_ptr != node_stack) {
@ -1154,6 +1155,7 @@ bsp_visit_world (const exprval_t **params, exprval_t *result, exprctx_t *ectx)
auto bframe = &bctx->frames.a[ctx->curFrame];
bctx->main_pass.bsp_context = bctx;
bctx->main_pass.entqueue = r_ent_queue;
bctx->main_pass.position = r_refdef.frame.position;
bctx->main_pass.vis_frame = r_visframecount;
bctx->main_pass.face_frames = r_face_visframes;