qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 23:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/vulkan/vulkan_output.c

285 lines
7.7 KiB
C
Raw Normal View History

[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
/*
vulkan_main.c
Vulkan output
Copyright (C) 2022 Bill Currie <bill@taniwha.org>
Author: Bill Currie <bill@taniwha.org>
Date: 2022/11/21
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include "string.h"
#endif
#ifdef HAVE_STRINGS_H
# include "strings.h"
#endif
#include "QF/cvar.h"
#include "QF/render.h"
#include "QF/sys.h"
[vulkan] Move 2d to the output render pass This separates 2d UI rendering from 3d world rendering, making way for various post-processing effects on the 3d render.
2022-11-27 00:51:01 +00:00
#include "QF/Vulkan/qf_draw.h"
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
#include "QF/Vulkan/qf_matrices.h"
#include "QF/Vulkan/qf_output.h"
#include "QF/Vulkan/qf_renderpass.h"
#include "QF/Vulkan/qf_vid.h"
[vulkan] Move swap chain image acquisition to the output module Swap chain acquisition is part of final output handling. However, as the correct frame buffers are required for the render passes, the acquisition needs to be performed during the preoutput render pass. Window resize is still broken, but this is a big step towards fixing it.
2022-11-25 07:08:15 +00:00
#include "QF/Vulkan/capture.h"
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
#include "QF/Vulkan/debug.h"
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/image.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/swapchain.h"
#include "vid_vulkan.h"
[vulkan] Make script support objects more private This will help keep changes to the scripting system localized once things are further cleaned up.
2022-11-24 14:44:07 +00:00
#include "vkparse.h"//FIXME
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
[vulkan] Move swap chain image acquisition to the output module Swap chain acquisition is part of final output handling. However, as the correct frame buffers are required for the render passes, the acquisition needs to be performed during the preoutput render pass. Window resize is still broken, but this is a big step towards fixing it.
2022-11-25 07:08:15 +00:00
static void
acquire_image (qfv_renderframe_t *rFrame)
{
vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
qfv_device_t *device = ctx->device;
[vulkan] Recreate image available semaphore It turns out the semaphore used for vkAcquireNextImageKHR may be left in a signaled state for VK_ERROR_OUT_OF_DATE_KHR. While it seems to be possible to clear the semaphore using an empty queue submission, destroying and recreating the semaphore works well. Still have problems with the frame buffer after window resize, though.
2022-11-25 09:14:32 +00:00
qfv_devfuncs_t *dfunc = device->funcs;
[vulkan] Move swap chain image acquisition to the output module Swap chain acquisition is part of final output handling. However, as the correct frame buffers are required for the render passes, the acquisition needs to be performed during the preoutput render pass. Window resize is still broken, but this is a big step towards fixing it.
2022-11-25 07:08:15 +00:00
__auto_type frame = &ctx->frames.a[ctx->curFrame];
//outputctx_t *octx = ctx->output_context;
//uint32_t curFrame = ctx->curFrame;
//outputframe_t *oframe = &octx->frames.a[curFrame];
//qfv_renderpass_t *rp = ctx->output_renderpass;
uint32_t imageIndex = 0;
while (!QFV_AcquireNextImage (ctx->swapchain,
frame->imageAvailableSemaphore,
0, &imageIndex)) {
QFV_DeviceWaitIdle (device);
if (ctx->capture) {
QFV_DestroyCapture (ctx->capture);
}
Vulkan_CreateSwapchain (ctx);
Vulkan_CreateCapture (ctx);
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
__auto_type out = ctx->output_renderpass;
out->output = (qfv_output_t) {
[vulkan] Move swap chain image acquisition to the output module Swap chain acquisition is part of final output handling. However, as the correct frame buffers are required for the render passes, the acquisition needs to be performed during the preoutput render pass. Window resize is still broken, but this is a big step towards fixing it.
2022-11-25 07:08:15 +00:00
.extent = ctx->swapchain->extent,
.format = ctx->swapchain->format,
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
.frames = ctx->swapchain->numImages,
[vulkan] Move swap chain image acquisition to the output module Swap chain acquisition is part of final output handling. However, as the correct frame buffers are required for the render passes, the acquisition needs to be performed during the preoutput render pass. Window resize is still broken, but this is a big step towards fixing it.
2022-11-25 07:08:15 +00:00
.view_list = ctx->swapchain->imageViews->a,
};
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
out->viewport.width = out->output.extent.width;
out->viewport.height = out->output.extent.height;
out->scissor.extent = out->output.extent;
QFV_RenderPass_CreateFramebuffer (out);
[vulkan] Recreate image available semaphore It turns out the semaphore used for vkAcquireNextImageKHR may be left in a signaled state for VK_ERROR_OUT_OF_DATE_KHR. While it seems to be possible to clear the semaphore using an empty queue submission, destroying and recreating the semaphore works well. Still have problems with the frame buffer after window resize, though.
2022-11-25 09:14:32 +00:00
dfunc->vkDestroySemaphore (device->dev, frame->imageAvailableSemaphore,
0);
frame->imageAvailableSemaphore = QFV_CreateSemaphore (device);
[vulkan] Move swap chain image acquisition to the output module Swap chain acquisition is part of final output handling. However, as the correct frame buffers are required for the render passes, the acquisition needs to be performed during the preoutput render pass. Window resize is still broken, but this is a big step towards fixing it.
2022-11-25 07:08:15 +00:00
}
ctx->swapImageIndex = imageIndex;
}
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
static void
update_input (qfv_renderframe_t *rFrame)
{
vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
outputctx_t *octx = ctx->output_context;
uint32_t curFrame = ctx->curFrame;
outputframe_t *oframe = &octx->frames.a[curFrame];
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
if (oframe->input == octx->input) {
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
return;
}
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
oframe->input = octx->input;
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
VkDescriptorImageInfo imageInfo = {
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
octx->sampler, oframe->input,
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
};
VkWriteDescriptorSet write[] = {
{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
oframe->set, 0, 0, 1,
VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
&imageInfo, 0, 0 }
};
dfunc->vkUpdateDescriptorSets (device->dev, 1, write, 0, 0);
}
[vulkan] Move swap chain image acquisition to the output module Swap chain acquisition is part of final output handling. However, as the correct frame buffers are required for the render passes, the acquisition needs to be performed during the preoutput render pass. Window resize is still broken, but this is a big step towards fixing it.
2022-11-25 07:08:15 +00:00
static void
preoutput_draw (qfv_renderframe_t *rFrame)
{
acquire_image (rFrame);
update_input (rFrame);
}
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
static void
[vulkan] Move 2d to the output render pass This separates 2d UI rendering from 3d world rendering, making way for various post-processing effects on the 3d render.
2022-11-27 00:51:01 +00:00
process_input (qfv_renderframe_t *rFrame)
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
{
vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
outputctx_t *octx = ctx->output_context;
outputframe_t *oframe = &octx->frames.a[ctx->curFrame];
VkCommandBuffer cmd = oframe->cmd;
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
DARRAY_APPEND (&rFrame->subpassCmdSets[0], cmd);
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
dfunc->vkResetCommandBuffer (cmd, 0);
VkCommandBufferInheritanceInfo inherit = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
rFrame->renderpass->renderpass, 0,
rFrame->framebuffer,
0, 0, 0,
};
VkCommandBufferBeginInfo beginInfo = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
};
dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
QFV_duCmdBeginLabel (device, cmd, "output:output");
dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
octx->pipeline);
dfunc->vkCmdSetViewport (cmd, 0, 1, &rFrame->renderpass->viewport);
dfunc->vkCmdSetScissor (cmd, 0, 1, &rFrame->renderpass->scissor);
VkDescriptorSet set[] = {
Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
oframe->set,
};
dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
octx->layout, 0, 2, set, 0, 0);
dfunc->vkCmdDraw (cmd, 3, 1, 0, 0);
QFV_duCmdEndLabel (device, cmd);
dfunc->vkEndCommandBuffer (cmd);
[vulkan] Move 2d to the output render pass This separates 2d UI rendering from 3d world rendering, making way for various post-processing effects on the 3d render.
2022-11-27 00:51:01 +00:00
}
static void
output_draw (qfv_renderframe_t *rFrame)
{
process_input (rFrame);
Vulkan_FlushText (rFrame);
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
}
void
Vulkan_Output_CreateRenderPasses (vulkan_ctx_t *ctx)
{
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
outputctx_t *octx = calloc (1, sizeof (outputctx_t));
ctx->output_context = octx;
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
__auto_type out = QFV_RenderPass_New (ctx, "output", output_draw);
out->output = (qfv_output_t) {
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
.extent = ctx->swapchain->extent,
.format = ctx->swapchain->format,
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
.frames = ctx->swapchain->numImages,
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
.view_list = ctx->swapchain->imageViews->a,
};
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
QFV_RenderPass_CreateRenderPass (out);
QFV_RenderPass_CreateFramebuffer (out);
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
ctx->output_renderpass = out;
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
out->order = QFV_rp_output;
DARRAY_APPEND (&ctx->renderPasses, out);
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
__auto_type pre = QFV_RenderPass_New (ctx, "preoutput", preoutput_draw);
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
pre->order = QFV_rp_preoutput;
DARRAY_APPEND (&ctx->renderPasses, pre);
}
void
Vulkan_Output_Init (vulkan_ctx_t *ctx)
{
qfv_device_t *device = ctx->device;
qfvPushDebug (ctx, "output init");
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
outputctx_t *octx = ctx->output_context;
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
size_t frames = ctx->frames.size;
DARRAY_INIT (&octx->frames, frames);
DARRAY_RESIZE (&octx->frames, frames);
octx->frames.grow = 0;
[vulkan] Make script support objects more private This will help keep changes to the scripting system localized once things are further cleaned up.
2022-11-24 14:44:07 +00:00
__auto_type pld = ctx->script_context->pipelineDef;//FIXME
ctx->script_context->pipelineDef = Vulkan_GetConfig (ctx, "qf_output");
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
octx->pipeline = Vulkan_CreateGraphicsPipeline (ctx, "output");
octx->layout = Vulkan_CreatePipelineLayout (ctx, "output_layout");
octx->sampler = Vulkan_CreateSampler (ctx, "linear");
__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
layouts->a[0] = Vulkan_CreateDescriptorSetLayout (ctx, "output_set");
for (size_t i = 0; i < frames; i++) {
layouts->a[i] = layouts->a[0];
}
__auto_type pool = Vulkan_CreateDescriptorPool (ctx, "output_pool");
__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
__auto_type cmdSet = QFV_AllocCommandBufferSet (1, alloca);
for (size_t i = 0; i < frames; i++) {
__auto_type oframe = &octx->frames.a[i];
[vulkan] Fix an uninitialized field Yay valgrind. Luckily, there was a very tiny probability for it causing problems, but 0 is better.
2022-12-10 10:02:40 +00:00
oframe->input = 0;
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
oframe->set = sets->a[i];
QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet);
oframe->cmd = cmdSet->a[0];
QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
oframe->cmd, "cmd:output");
}
[vulkan] Make script support objects more private This will help keep changes to the scripting system localized once things are further cleaned up.
2022-11-24 14:44:07 +00:00
ctx->script_context->pipelineDef = pld;
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
free (sets);
qfvPopDebug (ctx);
}
void
Vulkan_Output_Shutdown (vulkan_ctx_t *ctx)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
outputctx_t *octx = ctx->output_context;
dfunc->vkDestroyPipeline (device->dev, octx->pipeline, 0);
free (octx->frames.a);
free (octx);
}
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
void
Vulkan_Output_SetInput (vulkan_ctx_t *ctx, VkImageView input)
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
{
outputctx_t *octx = ctx->output_context;
[vulkan] Rework render pass setup This splits up render pass creation so that the creation of the various resources can be tailored to the needs of the actual render pass sub-system. In addition, it gets window resizing mostly working (just some problems with incorrect rendering).
2022-11-26 13:23:59 +00:00
octx->input = input;
[vulkan] Get two render pass rendering working Things are a bit of a mess with interdependence between sub-module initialization and render pass initialization, and window resizing is broken, but the main render pass rendering to an image that is then post-processed (currently just blitted) is working. This will make it possible to implement fisheye and water warp (and other effects, of course).
2022-11-25 02:07:08 +00:00
}
Reference in a new issue Copy permalink