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

[vulkan] Implement view model rendering

Browse source 
Quake just looked wrong without the view model. I can't say I like the
way the depth range is hacked, but it was necessary because the view
model needs to be processed along with the rest of the alias models
(didn't feel like adding more command buffers, which I imagine would be
expensive with the pipeline switching).
This commit is contained in:
Bill Currie 2021-07-25 14:03:25 +09:00
parent 13e1682f5e
commit 56c2fa380b
3 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,4 +113,6 @@ void Vulkan_AliasEnd (struct vulkan_ctx_s *ctx);
void Vulkan_Alias_Init (struct vulkan_ctx_s *ctx);
void Vulkan_Alias_Shutdown (struct vulkan_ctx_s *ctx);
void Vulkan_AliasDepthRange (struct vulkan_ctx_s *ctx, float n, float f);
#endif//__QF_Vulkan_qf_alias_h

18
libs/video/renderer/vulkan/vulkan_alias.c
View file

@ -255,6 +255,24 @@ Vulkan_AliasEnd (vulkan_ctx_t *ctx)
alias_end_subpass (aframe->cmdSet.a[QFV_aliasGBuffer], ctx);
}
void
Vulkan_AliasDepthRange (vulkan_ctx_t *ctx, float minDepth, float maxDepth)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
aliasctx_t *actx = ctx->alias_context;
aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
VkViewport viewport = ctx->viewport;
viewport.minDepth = minDepth;
viewport.maxDepth = maxDepth;
dfunc->vkCmdSetViewport (aframe->cmdSet.a[QFV_aliasDepth], 0, 1,
&viewport);
dfunc->vkCmdSetViewport (aframe->cmdSet.a[QFV_aliasGBuffer], 0, 1,
&viewport);
}
static VkDescriptorBufferInfo base_buffer_info = {
0, 0, VK_WHOLE_SIZE
};

32
libs/video/renderer/vulkan/vulkan_main.c
View file

@ -103,7 +103,7 @@ setup_view (vulkan_ctx_t *ctx)
}
static void
R_RenderEntities (vulkan_ctx_t *ctx)
Vulkan_RenderEntities (vulkan_ctx_t *ctx)
{
if (!r_drawentities->int_val)
return;
@ -118,7 +118,16 @@ R_RenderEntities (vulkan_ctx_t *ctx)
Vulkan_##Type##Begin (ctx); \
begun = 1; \
} \
/* hack the depth range to prevent view model */\
/* from poking into walls */\
if (ent == vr_data.view_model) { \
Vulkan_AliasDepthRange (ctx, 0, 0.3); \
} \
Vulkan_Draw##Type (ent, ctx); \
/* unhack in case the view_model is not the last */\
if (ent == vr_data.view_model) { \
Vulkan_AliasDepthRange (ctx, 0, 1); \
} \
} \
if (begun) \
Vulkan_##Type##End (ctx); \
@ -130,7 +139,7 @@ R_RenderEntities (vulkan_ctx_t *ctx)
}
static void
R_DrawViewModel (void)
Vulkan_DrawViewModel (vulkan_ctx_t *ctx)
{
entity_t *ent = vr_data.view_model;
if (vr_data.inhibit_viewmodel
@ -139,18 +148,13 @@ R_DrawViewModel (void)
|| !ent->renderer.model)
return;
// hack the depth range to prevent view model from poking into walls
//qfeglDepthRangef (0, 0.3);
//glsl_R_AliasBegin ();
//glsl_R_DrawAlias ();
//glsl_R_AliasEnd ();
//qfeglDepthRangef (0, 1);
R_EnqueueEntity (ent);
}
void
Vulkan_RenderView (vulkan_ctx_t *ctx)
{
double t[10] = {};
double t[9] = {};
int speeds = r_speeds->int_val;
if (speeds)
@ -171,7 +175,8 @@ Vulkan_RenderView (vulkan_ctx_t *ctx)
Vulkan_DrawSky (ctx);
if (speeds)
t[5] = Sys_DoubleTime ();
R_RenderEntities (ctx);
Vulkan_DrawViewModel (ctx);
Vulkan_RenderEntities (ctx);
if (speeds)
t[6] = Sys_DoubleTime ();
Vulkan_DrawWaterSurfaces (ctx);
@ -180,17 +185,14 @@ Vulkan_RenderView (vulkan_ctx_t *ctx)
Vulkan_DrawParticles (ctx);
if (speeds)
t[8] = Sys_DoubleTime ();
R_DrawViewModel ();
if (speeds)
t[9] = Sys_DoubleTime ();
if (speeds) {
Sys_Printf ("frame: %g, setup: %g, mark: %g, pushdl: %g, world: %g,"
" sky: %g, ents: %g, water: %g, part: %g, view: %g\n",
" sky: %g, ents: %g, water: %g, part: %g\n",
(t[9] - t[0]) * 1000, (t[1] - t[0]) * 1000,
(t[2] - t[1]) * 1000, (t[3] - t[2]) * 1000,
(t[4] - t[3]) * 1000, (t[5] - t[4]) * 1000,
(t[6] - t[5]) * 1000, (t[7] - t[6]) * 1000,
(t[8] - t[7]) * 1000, (t[9] - t[8]) * 1000);
(t[8] - t[7]) * 1000);
}
}