zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 01:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the command buffers from VkCommandBufferManager

Browse source
This commit is contained in:
Magnus Norddahl 2023-09-02 15:14:01 +02:00 committed by Christoph Oelckers
parent 634e6b2603
commit 3c0b8ccc14
3 changed files with 19 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp
View file

@ -1,6 +1,7 @@
#include "vk_lightmap.h"
#include "vulkan/vk_renderdevice.h"
#include "vulkan/commands/vk_commandbuffer.h"
#include "vk_raytrace.h"
#include "zvulkan/vulkanbuilders.h"
#include "halffloat.h"
@ -11,9 +12,6 @@ VkLightmap::VkLightmap(VulkanRenderDevice* fb) : fb(fb)
{
useRayQuery = fb->GetDevice()->PhysicalDevice.Features.RayQuery.rayQuery;
submitFence = std::make_unique<VulkanFence>(fb->GetDevice());
cmdpool = std::make_unique<VulkanCommandPool>(fb->GetDevice(), fb->GetDevice()->GraphicsFamily);
CreateUniformBuffer();
CreateSceneVertexBuffer();
CreateSceneLightBuffer();
@ -39,7 +37,6 @@ void VkLightmap::Raytrace(LevelMesh* level)
CreateAtlasImages();
BeginCommands();
UploadUniforms();
@ -53,7 +50,7 @@ void VkLightmap::Raytrace(LevelMesh* level)
ResolveAtlasImage(pageIndex);
}
FinishCommands();
fb->GetCommands()->WaitForCommands(false);
for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++)
{
@ -61,39 +58,18 @@ void VkLightmap::Raytrace(LevelMesh* level)
}
}
void VkLightmap::BeginCommands()
{
cmdbuffer = cmdpool->createBuffer();
cmdbuffer->begin();
}
void VkLightmap::FinishCommands()
{
cmdbuffer->end();
QueueSubmit()
.AddCommandBuffer(cmdbuffer.get())
.Execute(fb->GetDevice(), fb->GetDevice()->GraphicsQueue, submitFence.get());
VkResult result = vkWaitForFences(fb->GetDevice()->device, 1, &submitFence->fence, VK_TRUE, std::numeric_limits<uint64_t>::max());
if (result != VK_SUCCESS)
throw std::runtime_error("vkWaitForFences failed");
result = vkResetFences(fb->GetDevice()->device, 1, &submitFence->fence);
if (result != VK_SUCCESS)
throw std::runtime_error("vkResetFences failed");
cmdbuffer.reset();
}
void VkLightmap::RenderAtlasImage(size_t pageIndex)
{
LightmapImage& img = atlasImages[pageIndex];
const auto beginPass = [&]() {
auto cmdbuffer = fb->GetCommands()->GetTransferCommands();
RenderPassBegin()
.RenderPass(raytrace.renderPass.get())
.RenderArea(0, 0, atlasImageSize, atlasImageSize)
.Framebuffer(img.raytrace.Framebuffer.get())
.Execute(cmdbuffer.get());
.Execute(cmdbuffer);
VkDeviceSize offset = 0;
cmdbuffer->bindVertexBuffers(0, 1, &vertices.Buffer->buffer, &offset);
@ -115,7 +91,7 @@ void VkLightmap::RenderAtlasImage(size_t pageIndex)
viewport.y = (float)targetSurface->lightmapperAtlasY - 1;
viewport.width = (float)(targetSurface->texWidth + 2);
viewport.height = (float)(targetSurface->texHeight + 2);
cmdbuffer->setViewport(0, 1, &viewport);
fb->GetCommands()->GetTransferCommands()->setViewport(0, 1, &viewport);
// Paint all surfaces part of the smoothing group into the surface
for (LevelMeshSurface* surface : mesh->SmoothingGroups[targetSurface->smoothingGroupIndex].surfaces)
@ -132,14 +108,15 @@ void VkLightmap::RenderAtlasImage(size_t pageIndex)
if (lights.Pos + lightCount > lights.BufferSize || vertices.Pos + vertexCount > vertices.BufferSize)
{
// Flush scene buffers
FinishCommands();
fb->GetCommands()->WaitForCommands(false);
lights.Pos = 0;
vertices.Pos = 0;
firstLight = 0;
firstVertex = 0;
BeginCommands();
beginPass();
fb->GetCommands()->GetTransferCommands()->setViewport(0, 1, &viewport);
if (lights.Pos + lightCount > lights.BufferSize)
{
throw std::runtime_error("SceneLightBuffer is too small!");
@ -173,7 +150,7 @@ void VkLightmap::RenderAtlasImage(size_t pageIndex)
pc.LightmapOrigin = targetSurface->worldOrigin - targetSurface->worldStepX - targetSurface->worldStepY;
pc.LightmapStepX = targetSurface->worldStepX * viewport.width;
pc.LightmapStepY = targetSurface->worldStepY * viewport.height;
cmdbuffer->pushConstants(raytrace.pipelineLayout.get(), VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(LightmapPushConstants), &pc);
fb->GetCommands()->GetTransferCommands()->pushConstants(raytrace.pipelineLayout.get(), VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(LightmapPushConstants), &pc);
SceneVertex* vertex = &vertices.Vertices[firstVertex];
@ -192,11 +169,11 @@ void VkLightmap::RenderAtlasImage(size_t pageIndex)
(vertex++)->Position = ToUV(surface->verts[1], targetSurface);
}
cmdbuffer->draw(vertexCount, 1, firstVertex, 0);
fb->GetCommands()->GetTransferCommands()->draw(vertexCount, 1, firstVertex, 0);
}
}
cmdbuffer->endRenderPass();
fb->GetCommands()->GetTransferCommands()->endRenderPass();
}
void VkLightmap::CreateAtlasImages()
@ -231,25 +208,28 @@ void VkLightmap::UploadUniforms()
*reinterpret_cast<Uniforms*>(uniforms.Uniforms + uniforms.StructStride * uniforms.Index) = values;
uniforms.TransferBuffer->Unmap();
auto cmdbuffer = fb->GetCommands()->GetTransferCommands();
cmdbuffer->copyBuffer(uniforms.TransferBuffer.get(), uniforms.Buffer.get());
PipelineBarrier()
.AddBuffer(uniforms.Buffer.get(), VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT)
.Execute(cmdbuffer.get(), VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
.Execute(cmdbuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
}
void VkLightmap::ResolveAtlasImage(size_t i)
{
LightmapImage& img = atlasImages[i];
auto cmdbuffer = fb->GetCommands()->GetTransferCommands();
PipelineBarrier()
.AddImage(img.raytrace.Image.get(), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT)
.Execute(cmdbuffer.get(), VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
.Execute(cmdbuffer, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
RenderPassBegin()
.RenderPass(resolve.renderPass.get())
.RenderArea(0, 0, atlasImageSize, atlasImageSize)
.Framebuffer(img.resolve.Framebuffer.get())
.Execute(cmdbuffer.get());
.Execute(cmdbuffer);
VkDeviceSize offset = 0;
cmdbuffer->bindVertexBuffers(0, 1, &vertices.Buffer->buffer, &offset);
@ -292,7 +272,7 @@ void VkLightmap::ResolveAtlasImage(size_t i)
PipelineBarrier()
.AddImage(img.resolve.Image.get(), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT)
.Execute(cmdbuffer.get(), VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
.Execute(cmdbuffer, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
VkBufferImageCopy region = {};
region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;

7
src/common/rendering/vulkan/accelstructs/vk_lightmap.h
View file

@ -84,9 +84,6 @@ public:
private:
void UpdateAccelStructDescriptors();
void BeginCommands();
void FinishCommands();
void UploadUniforms();
void CreateAtlasImages();
void RenderAtlasImage(size_t pageIndex);
@ -169,10 +166,6 @@ private:
std::unique_ptr<VulkanSampler> sampler;
} resolve;
std::unique_ptr<VulkanFence> submitFence;
std::unique_ptr<VulkanCommandPool> cmdpool;
std::unique_ptr<VulkanCommandBuffer> cmdbuffer;
std::vector<LightmapImage> atlasImages;
static const int atlasImageSize = 2048;
};

1
src/common/rendering/vulkan/vk_renderdevice.cpp
View file

@ -551,7 +551,6 @@ void VulkanRenderDevice::SetLevelMesh(LevelMesh* mesh)
Printf("Running VkLightmap.\n");
GetCommands()->WaitForCommands(false);
GetLightmap()->Raytrace(mesh);
Printf("Copying data.\n");