Skip to content

Commit

Permalink
feat: implement resource upload scheme
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Pollind <[email protected]>
  • Loading branch information
@pollend
pollend committed Jan 27, 2025
1 parent 4f99c6b commit 2f9cb63
Show file tree
Hide file tree
Showing 19 changed files with 1,067 additions and 419 deletions.
4 changes: 4 additions & 0 deletions source/qcore/qtypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@

#include <stdint.h>

#define KB_TO_BYTE (1024)
#define MB_TO_BYTE (1024 * KB_TO_BYTE)
#define GB_TO_BYTE (1024 * MB_TO_BYTE)

#if INTPTR_MAX == 0x7FFFFFFFFFFFFFFFLL
#define Q_PTR_SIZE 8
#elif INTPTR_MAX == 0x7FFFFFFF
Expand Down
9 changes: 4 additions & 5 deletions source/ref_nri/r_frame_cmd_buffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
#include "r_graphics.h"

#include "qhash.h"
#include "ri_format.h"

#define POGO_BUFFER_TEXTURE_FORMAT NriFormat_RGBA8_UNORM
#define POGO_BUFFER_TEXTURE_FORMAT RI_FORMAT_RGBA8_UNORM

typedef struct mesh_vbo_s mesh_vbo_t;
typedef struct mfog_s mfog_t;
Expand Down Expand Up @@ -106,12 +107,10 @@ struct frame_tex_buffers_s {
NriDescriptor *colorAttachment;
NriTexture *colorTexture;

struct RITexture_s* riColorTexture;

NriDescriptor *depthAttachment;
NriTexture* depthTexture;

struct RITexture_s* riDepthTexture;
struct RITextureHandle_s* riDepthTexture;

// used for post processing
struct pogo_buffers_s {
Expand Down Expand Up @@ -149,7 +148,7 @@ struct frame_cmd_buffer_s {
} vk;
#endif
};
struct RICmd_s command;
struct RICmdHandle_s command;

uint64_t frameCount; // this value is bound by NUMBER_FRAMES_FLIGHT
struct block_buffer_pool_s uboBlockBuffer;
Expand Down
73 changes: 54 additions & 19 deletions source/ref_nri/r_frontend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ rserr_t RF_Init( const char *applicationName, const char *screenshotPrefix, int
};

rsh.shadowSamplerDescriptor = R_CreateDescriptorWrapper( &rsh.nri, R_ResolveSamplerDescriptor( IT_DEPTHCOMPARE | IT_SPECIAL | IT_DEPTH ) );
GPU_VULKAN_BLOCK( renderer, ( {
GPU_VULKAN_BLOCK( (&rsh.renderer), ( {
for( size_t i = 0; i < NUMBER_FRAMES_FLIGHT; i++ ) {
VkCommandPoolCreateInfo commandPoolInfo = { VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO };
commandPoolInfo.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
Expand All @@ -191,11 +191,11 @@ rserr_t RF_Init( const char *applicationName, const char *screenshotPrefix, int
info.commandPool = rsh.frameCmds[i].vk.pool;
info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
info.commandBufferCount = 1;
result = vkAllocateCommandBuffers( rsh.device.vk.device, &info, &rsh.frameCmds[i].command.vk.cmd );
if( result != VK_SUCCESS ) {
Com_Printf( "Vulkan failed error - vk: %d", result );
return rserr_unknown;
}
// result = vkAllocateCommandBuffers( rsh.device.vk.device, &info, &rsh.frameCmds[i].command.vk.cmd );
// if( result != VK_SUCCESS ) {
// Com_Printf( "Vulkan failed error - vk: %d", result );
// return rserr_unknown;
// }
InitBlockBufferPool( &rsh.nri, &rsh.frameCmds[i].uboBlockBuffer, &uboBlockBufferDesc );
}
}));
Expand Down Expand Up @@ -264,29 +264,21 @@ rserr_t RF_SetMode( int x, int y, int width, int height, int displayFrequency, b
{
struct RIWindowHandle_s windowHandle = {};

NriWindow nriWindow = { 0 };
switch( handle.winType ) {
case VID_WINDOW_WAYLAND:
windowHandle.type = RI_WINDOW_WAYLAND;
windowHandle.wayland.surface = handle.window.wayland.surface;
windowHandle.wayland.display = handle.window.wayland.display;

nriWindow.wayland.surface = handle.window.wayland.surface;
nriWindow.wayland.display = handle.window.wayland.display;
break;
case VID_WINDOW_TYPE_X11:
windowHandle.type = RI_WINDOW_X11;
windowHandle.x11.window = handle.window.x11.window;
windowHandle.x11.dpy = handle.window.x11.dpy;

nriWindow.x11.window = handle.window.x11.window;
nriWindow.x11.dpy = handle.window.x11.dpy;
break;
case VID_WINDOW_WIN32:
windowHandle.type = RI_WINDOW_WIN32;
windowHandle.windows.hwnd = handle.window.win.hwnd;

nriWindow.windows.hwnd = handle.window.win.hwnd;
break;
default:
assert( false );
Expand All @@ -301,19 +293,62 @@ rserr_t RF_SetMode( int x, int y, int width, int height, int displayFrequency, b
swapchainInit.format = RI_SWAPCHAIN_BT709_G22_8BIT;
InitRISwapchain(&rsh.device, &swapchainInit, &rsh.riSwapchain);

GPU_VULKAN_BLOCK( ( &rsh.renderer ), ({
uint32_t queueFamilies[RI_QUEUE_LEN] = { 0 };
VkImageCreateInfo info = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };
VkImageCreateFlags flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT | VK_IMAGE_CREATE_EXTENDED_USAGE_BIT; // typeless
info.flags = flags;
info.imageType = VK_IMAGE_TYPE_2D;
info.extent.width = rsh.riSwapchain.width;
info.extent.height = rsh.riSwapchain.height;
info.extent.depth = 1;
info.mipLevels = 1;
info.arrayLayers = 1;
info.samples = 1;
info.tiling = VK_IMAGE_TILING_OPTIMAL;
info.pQueueFamilyIndices = queueFamilies;
vk_fillQueueFamilies( &rsh.device, queueFamilies, &info.queueFamilyIndexCount, RI_QUEUE_LEN );
info.sharingMode = ( info.queueFamilyIndexCount > 0 ) ? VK_SHARING_MODE_CONCURRENT : VK_SHARING_MODE_EXCLUSIVE; // TODO: still no DCC on AMD with concurrent?
info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;

VkImageViewUsageCreateInfo usageInfo = { VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO };
usageInfo.usage |= VK_IMAGE_USAGE_SAMPLED_BIT;
VkImageSubresourceRange subresource = {
VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1,
};
VkImageViewCreateInfo createInfo = { VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO };
createInfo.pNext = &usageInfo;
createInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
createInfo.format = info.format;
createInfo.subresourceRange = subresource;

for( uint32_t i = 0; i < NUMBER_FRAMES_FLIGHT; i++ ) {
info.format = RIFormatToVK( POGO_BUFFER_TEXTURE_FORMAT );
if( VK_WrapResult( vkCreateImage( rsh.device.vk.device, &info, NULL, &rsh.vk.pogo[( i * 2 )] ) ) ) {
}
if( VK_WrapResult( vkCreateImage( rsh.device.vk.device, &info, NULL, &rsh.vk.pogo[( i * 2 ) + 1] ) ) ) {
}
info.format = RIFormatToVK( RI_FORMAT_D32_SFLOAT );
if( VK_WrapResult( vkCreateImage( rsh.device.vk.device, &info, NULL, &rsh.vk.depthImages[i] ) ) ) {
}

createInfo.image = rsh.vk.depthImages[i];
RI_VK_InitImageView(&rsh.device, &createInfo, rsh.vk.depthAttachment + i );
}
}));

arrsetlen( rsh.backBuffers, rsh.riSwapchain.imageCount);
for( uint32_t i = 0; i < rsh.riSwapchain.imageCount; i++ ) {
rsh.backBuffers[i].riColorTexture = rsh.riSwapchain.images + i;
}
//for( uint32_t i = 0; i < rsh.riSwapchain.imageCount; i++ ) {
// rsh.backBuffers[i].riColorTexture = rsh.riSwapchain.images + i;
//}


NriSwapChainDesc swapChainDesc = {
.commandQueue = rsh.nri.graphicsCommandQueue,
.width = width,
.height = height,
.format = DefaultSwapchainFormat,
.textureNum = 3,
.window = nriWindow };
.textureNum = 3 };
__ShutdownSwapchainTexture();

assert(rsh.frameFence == NULL);
Expand Down
Loading

0 comments on commit 2f9cb63

Please sign in to comment.