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

[vulkan] Recreate lighting pvs sets when loading lights

Browse source 
Sets never shrink, so assigning a dynamically created set to a
statically created set after the working size has reduced (going from
demo2 to demo3) causes the set code to attempt to resize the statically
created set, which leads to libc having a bad time.
This commit is contained in:
Bill Currie 2021-12-01 07:51:38 +09:00
parent 0c0fce2f03
commit 422ad2a6c9
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,8 +308,6 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
DARRAY_RESIZE (&lctx->frames, frames); DARRAY_RESIZE (&lctx->frames, frames);
lctx->frames.grow = 0; lctx->frames.grow = 0;
lctx->sun_pvs = set_new ();
lctx->pipeline = Vulkan_CreatePipeline (ctx, "lighting"); lctx->pipeline = Vulkan_CreatePipeline (ctx, "lighting");
lctx->layout = Vulkan_CreatePipelineLayout (ctx, "lighting_layout"); lctx->layout = Vulkan_CreatePipelineLayout (ctx, "lighting_layout");
lctx->sampler = Vulkan_CreateSampler (ctx, "shadow_sampler"); lctx->sampler = Vulkan_CreateSampler (ctx, "shadow_sampler");
@ -373,9 +371,8 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
shadow_set->a[i], shadow_set->a[i],
va (ctx->va_ctx, "lighting:shadow_set:%zd", i)); va (ctx->va_ctx, "lighting:shadow_set:%zd", i));
lframe->pvs = set_new ();
DARRAY_INIT (&lframe->lightvis, 16); DARRAY_INIT (&lframe->lightvis, 16);
lframe->pvs = 0;
lframe->leaf = 0; lframe->leaf = 0;
QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet); QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet);
@ -923,6 +920,17 @@ Vulkan_LoadLights (model_t *model, const char *entity_data, vulkan_ctx_t *ctx)
lctx->lights.size = 0; lctx->lights.size = 0;
lctx->lightleafs.size = 0; lctx->lightleafs.size = 0;
lctx->lightmats.size = 0; lctx->lightmats.size = 0;
if (lctx->sun_pvs) {
set_delete (lctx->sun_pvs);
}
lctx->sun_pvs = set_new_size (model->brush.visleafs);
for (size_t i = 0; i < ctx->frames.size; i++) {
__auto_type lframe = &lctx->frames.a[i];
if (lframe->pvs) {
set_delete (lframe->pvs);
}
lframe->pvs = set_new_size (model->brush.visleafs);
}
clear_shadows (ctx); clear_shadows (ctx);