Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vk: issue a barrier for staging buffer uploads 

Trad rendering still works with this slightly more tight sync model.

It is suboptimal as it doesn't really know the previous op on the
buffer, so it has to do the ALL_COMMANDS stages, which makes validation
a bit sore.
This commit is contained in:
Ivan Avdeev 2024-05-01 16:02:55 -04:00
parent c3a41f9097
commit 14ab0662df
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ref/vk/vk_render.c
View File

@ -641,6 +641,7 @@ static uint32_t writeDlightsToUBO( void )
return ubo_lights_offset;
}
/*
static void debugBarrier( VkCommandBuffer cmdbuf, VkBuffer buf) {
const VkBufferMemoryBarrier bmb[] = { {
.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
@ -655,26 +656,27 @@ static void debugBarrier( VkCommandBuffer cmdbuf, VkBuffer buf) {
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
0, 0, NULL, ARRAYSIZE(bmb), bmb, 0, NULL);
}
*/
void VK_Render_FIXME_Barrier( VkCommandBuffer cmdbuf ) {
const VkBuffer geom_buffer = R_GeometryBuffer_Get();
debugBarrier(cmdbuf, geom_buffer);
// FIXME
//debugBarrier(cmdbuf, geom_buffer);
// FIXME: this should be automatic and dynamically depend on actual usage, resolving this with render graph
{
const VkBufferMemoryBarrier bmb[] = { {
.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
//.dstAccessMask = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR, // FIXME
.dstAccessMask = VK_ACCESS_INDEX_READ_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT , // FIXME
.dstAccessMask
= VK_ACCESS_INDEX_READ_BIT
| VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT
| (vk_core.rtx ? ( VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR | VK_ACCESS_SHADER_READ_BIT) : 0),
.buffer = geom_buffer,
.offset = 0, // FIXME
.size = VK_WHOLE_SIZE, // FIXME
.offset = 0,
.size = VK_WHOLE_SIZE,
} };
vkCmdPipelineBarrier(cmdbuf,
VK_PIPELINE_STAGE_TRANSFER_BIT,
//VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR,
//VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR | VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR,
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | (vk_core.rtx ? VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR | VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR : 0),
0, 0, NULL, ARRAYSIZE(bmb), bmb, 0, NULL);
}
}

41
ref/vk/vk_staging.c
View File

@ -5,10 +5,12 @@
#include "profiler.h"
#include "r_speeds.h"
#include "vk_combuf.h"
#include "vk_logs.h"
#include <memory.h>
#define MODULE_NAME "staging"
#define LOG_MODULE staging
#define DEFAULT_STAGING_SIZE (128*1024*1024)
#define MAX_STAGING_ALLOCS (2048)
@ -198,6 +200,45 @@ static void commitBuffers(vk_combuf_t *combuf) {
// - upload once per buffer
// - join adjacent regions
BOUNDED_ARRAY(barriers, VkBufferMemoryBarrier, 4);
for (int i = 0; i < g_staging.buffers.count; i++) {
const VkBuffer dst_buf = g_staging.buffers.dest[i];
for (int j = 0;; ++j) {
if (j == COUNTOF(barriers.items)) {
ERR("Ran out of buffer barrier slots, oh no");
break;
}
// Instert last
if (j == barriers.count) {
barriers.count++;
barriers.items[j] = (VkBufferMemoryBarrier){
.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
.buffer = dst_buf,
.offset = 0,
.size = VK_WHOLE_SIZE,
};
break;
}
// Already inserted
if (barriers.items[j].buffer == dst_buf)
break;
}
}
if (barriers.count) {
vkCmdPipelineBarrier(cmdbuf,
// FIXME this should be more concrete. Will need to pass buffer "state" around.
// For now it works, but makes validation uhappy.
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_TRANSFER_BIT,
0, 0, NULL, barriers.count, barriers.items, 0, NULL);
}
VkBuffer prev_buffer = VK_NULL_HANDLE;
int first_copy = 0;
for (int i = 0; i < g_staging.buffers.count; i++) {