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

[vulkan] Prioritize fisheye over waterwarp

Browse source 
Pushing waterwarp's constants into fisheye's buffer resulted in some
rather weird effects when underwater with fisheye active.
This commit is contained in:
Bill Currie 2023-01-24 00:52:40 +09:00
parent 36f1c26ac1
commit 6d7a9e2bc2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/video/renderer/vulkan/vulkan_output.c
View file

@ -184,13 +184,7 @@ process_input (qfv_renderframe_t *rFrame)
}; };
dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
layout, 0, 2, set, 0, 0); layout, 0, 2, set, 0, 0);
if (r_dowarp) { if (scr_fisheye) {
float time = vr_data.realtime;
qfv_push_constants_t push_constants[] = {
{ VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof (float), &time },
};
QFV_PushConstants (device, cmd, layout, 1, push_constants);
} else if (scr_fisheye) {
float width = r_refdef.vrect.width; float width = r_refdef.vrect.width;
float height = r_refdef.vrect.height; float height = r_refdef.vrect.height;
@ -201,6 +195,12 @@ process_input (qfv_renderframe_t *rFrame)
{ VK_SHADER_STAGE_FRAGMENT_BIT, 4, sizeof (float), &aspect }, { VK_SHADER_STAGE_FRAGMENT_BIT, 4, sizeof (float), &aspect },
}; };
QFV_PushConstants (device, cmd, layout, 2, push_constants); QFV_PushConstants (device, cmd, layout, 2, push_constants);
} else if (r_dowarp) {
float time = vr_data.realtime;
qfv_push_constants_t push_constants[] = {
{ VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof (float), &time },
};
QFV_PushConstants (device, cmd, layout, 1, push_constants);
} }
dfunc->vkCmdDraw (cmd, 3, 1, 0, 0); dfunc->vkCmdDraw (cmd, 3, 1, 0, 0);