Half-Life-RTX/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/w23/xash3d-fwgs synced 2025-01-18 23:00:01 +01:00
Code Issues Projects Releases Wiki Activity

rtx: improve render-ray interop

Browse Source 
make a vk_ray_model_t that stores everything ray-tracing related, and can also be cached directly
This commit is contained in:
Ivan 'provod' Avdeev 2021-05-24 11:14:03 -07:00
parent 5de30a4ff0
commit 44909ccbe5
5 changed files with 129 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ref_vk/TODO.md
View File

@ -239,3 +239,9 @@
## 2021-05-..-17, E93, E94
- [x] rtx: improve AS lifetime/management; i.e. pre-cache them, etc
- [x] add debug names to all of the buffers
## 2021-05-22, E97
- [x] add nvidia aftermath sdk
# 2021-05-24, E98
- [x] rtx: simplify AS tracking

38
ref_vk/vk_render.c
View File

@ -765,34 +765,6 @@ void VK_RenderEndRTX( VkCommandBuffer cmdbuf, VkImageView img_dst_view, VkImage
ASSERT(vk_core.rtx);
// FIXME fix me
if (!vk_core.rtx) {
for (int i = 0; i < g_render_state.num_draw_commands; ++i) {
const draw_command_t *const draw = g_render_state.draw_commands + i;
const vk_buffer_alloc_t *vertex_buffer = getBufferFromHandle( draw->draw.vertex_buffer );
const vk_buffer_alloc_t *index_buffer = draw->draw.index_buffer != InvalidHandle ? getBufferFromHandle( draw->draw.index_buffer ) : NULL;
const uint32_t vertex_offset = vertex_buffer->buffer_offset_in_units + draw->draw.vertex_offset;
// TODO there's a more complex story with lifetimes and rebuilds && vertex_buffer->lifetime < LifetimeSingleFrame)
// TODO it would make sense to join logical models into a single ray model
// but here we've completely lost this info, as models are now just a stream
// of independent draws
const vk_ray_model_dynamic_t dynamic_model = {
.element_count = draw->draw.element_count,
.max_vertex = vertex_buffer->count, // TODO this is an upper bound for brushes at least, it can be lowered
.index_offset = index_buffer ? (draw->draw.index_offset + index_buffer->buffer_offset_in_units) : UINT32_MAX,
.vertex_offset = (draw->draw.vertex_offset + vertex_buffer->buffer_offset_in_units),
.buffer = g_render.buffer.buffer,
.transform_row = &draw->transform,
.emissive = { draw->draw.emissive.r, draw->draw.emissive.g, draw->draw.emissive.b },
.texture_id = draw->draw.texture,
};
VK_RayFrameAddModelDynamic(cmdbuf, &dynamic_model);
}
}
{
const vk_ray_frame_render_args_t args = {
.cmdbuf = cmdbuf,
@ -849,8 +821,8 @@ qboolean VK_RenderModelInit( vk_render_model_t *model ) {
.buffer = g_render.buffer.buffer,
.model = model,
};
model->rtx.blas = VK_NULL_HANDLE;
return VK_RayModelInit(args);
model->ray_model = VK_RayModelInit(args);
return !!model->ray_model;
}
// TODO pre-bake optimal draws
@ -859,13 +831,13 @@ qboolean VK_RenderModelInit( vk_render_model_t *model ) {
void VK_RenderModelDestroy( vk_render_model_t* model ) {
if (vk_core.rtx) {
VK_RayModelDestroy(model);
VK_RayModelDestroy(model->ray_model);
}
}
void VK_RenderModelDraw( vk_render_model_t* model ) {
if (vk_core.rtx) {
VK_RayFrameAddModel(model, g_render_state.model);
VK_RayFrameAddModel(model->ray_model, (const matrix3x4*)g_render_state.model);
return;
}
@ -940,8 +912,6 @@ void VK_RenderModelDynamicBegin( const char *debug_name, int render_mode ) {
g_dynamic_model.model.geometries = g_dynamic_model.geometries;
g_dynamic_model.model.num_geometries = 0;
g_dynamic_model.model.render_mode = render_mode;
g_dynamic_model.model.rtx.blas = VK_NULL_HANDLE;
g_dynamic_model.model.rtx.kusochki_offset = 0;
}
void VK_RenderModelDynamicAddGeometry( const vk_render_geometry_t *geom ) {
ASSERT(g_dynamic_model.model.geometries);

8
ref_vk/vk_render.h
View File

@ -80,7 +80,7 @@ typedef struct {
int surface_index;
} vk_render_geometry_t;
struct vk_accel_s;
struct vk_ray_model_s;
typedef struct vk_render_model_s {
const char *debug_name;
@ -93,11 +93,7 @@ typedef struct vk_render_model_s {
// This model will be one-frame only, its buffers are not preserved between frames
qboolean dynamic;
struct {
VkAccelerationStructureKHR blas;
uint32_t kusochki_offset;
struct vk_accel_s *cache_accel;
} rtx;
struct vk_ray_model_s *ray_model;
} vk_render_model_t;
qboolean VK_RenderModelInit( vk_render_model_t* model );

254
ref_vk/vk_rtx.c
View File

@ -59,21 +59,20 @@ typedef struct {
} kusochki[MAX_EMISSIVE_KUSOCHKI];
} vk_emissive_kusochki_t;
typedef struct vk_accel_s {
typedef struct vk_ray_model_s {
VkAccelerationStructureKHR as;
VkAccelerationStructureGeometryKHR *geoms;
int num_geoms;
int size;
uint32_t kusochki_offset;
qboolean dynamic;
qboolean taken;
} vk_accel_t;
} vk_ray_model_t;
typedef struct {
matrix3x4 transform_row;
VkAccelerationStructureKHR accel;
vk_accel_t *cache_accel;
uint32_t kusochki_offset;
qboolean dynamic;
} vk_ray_model_t;
vk_ray_model_t *model;
} vk_ray_draw_model_t;
typedef struct {
float t;
@ -167,7 +166,7 @@ static struct {
struct {
int num_models;
int num_lighttextures;
vk_ray_model_t models[MAX_ACCELS];
vk_ray_draw_model_t models[MAX_ACCELS];
uint32_t scratch_offset; // for building dynamic blases
} frame;
@ -177,11 +176,9 @@ static struct {
qboolean reload_pipeline;
qboolean freeze_models;
#define ACCEL_CACHE_SIZE 1024
struct {
vk_accel_t accels[ACCEL_CACHE_SIZE];
} blas_cache;
} g_rtx;
#define MODEL_CACHE_SIZE 1024
vk_ray_model_t models_cache[MODEL_CACHE_SIZE];
} g_rtx = {0};
static VkDeviceAddress getBufferDeviceAddress(VkBuffer buffer) {
const VkBufferDeviceAddressInfo bdai = {.sType = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO, .buffer = buffer};
@ -207,36 +204,36 @@ typedef struct {
qboolean dynamic;
} as_build_args_t;
static void returnBlasToCache(vk_accel_t *accel) {
ASSERT(accel->taken);
accel->taken = false;
static void returnModelToCache(vk_ray_model_t *model) {
ASSERT(model->taken);
model->taken = false;
}
static vk_accel_t *getBlasFromCache(int num_geoms, const VkAccelerationStructureGeometryKHR *geoms) { //}, int size) {
vk_accel_t *accel = NULL;
static vk_ray_model_t *getModelFromCache(int num_geoms, const VkAccelerationStructureGeometryKHR *geoms) { //}, int size) {
vk_ray_model_t *model = NULL;
int i;
for (i = 0; i < ARRAYSIZE(g_rtx.blas_cache.accels); ++i)
for (i = 0; i < ARRAYSIZE(g_rtx.models_cache); ++i)
{
accel = g_rtx.blas_cache.accels + i;
if (accel->taken)
model = g_rtx.models_cache + i;
if (model->taken)
continue;
if (!accel->as)
if (!model->as)
break;
if (accel->num_geoms != num_geoms)
if (model->num_geoms != num_geoms)
continue;
int j;
for (j = 0; j < num_geoms; ++j) {
if (accel->geoms[j].geometryType != geoms[j].geometryType)
if (model->geoms[j].geometryType != geoms[j].geometryType)
break;
if (accel->geoms[j].flags != geoms[j].flags)
if (model->geoms[j].flags != geoms[j].flags)
if (geoms[j].geometryType == VK_GEOMETRY_TYPE_TRIANGLES_KHR) {
// TODO what else should we compare?
if (accel->geoms[j].geometry.triangles.maxVertex != geoms[j].geometry.triangles.maxVertex)
if (model->geoms[j].geometry.triangles.maxVertex != geoms[j].geometry.triangles.maxVertex)
break;
} else {
PRINT_NOT_IMPLEMENTED_ARGS("Non-tri geometries are not implemented");
@ -248,21 +245,21 @@ static vk_accel_t *getBlasFromCache(int num_geoms, const VkAccelerationStructure
break;
}
if (i == ARRAYSIZE(g_rtx.blas_cache.accels))
if (i == ARRAYSIZE(g_rtx.models_cache))
return NULL;
// if (accel->size > 0)
// ASSERT(accel->size >= size);
// if (model->size > 0)
// ASSERT(model->size >= size);
if (!accel->geoms) {
if (!model->geoms) {
const size_t size = sizeof(*geoms) * num_geoms;
accel->geoms = Mem_Malloc(vk_core.pool, size);
memcpy(accel->geoms, geoms, size);
accel->num_geoms = num_geoms;
model->geoms = Mem_Malloc(vk_core.pool, size);
memcpy(model->geoms, geoms, size);
model->num_geoms = num_geoms;
}
accel->taken = true;
return accel;
model->taken = true;
return model;
}
static qboolean createOrUpdateAccelerationStructure(VkCommandBuffer cmdbuf, const as_build_args_t *args) {
@ -354,6 +351,16 @@ void VK_RayNewMap( void ) {
VK_RingBuffer_Clear(&g_rtx.accels_buffer_alloc);
VK_RingBuffer_Clear(&g_rtx.kusochki_alloc);
// Clear model cache
for (int i = 0; i < ARRAYSIZE(g_rtx.models_cache); ++i) {
vk_ray_model_t *model = g_rtx.models_cache + i;
if (model->as == VK_NULL_HANDLE)
break;
vkDestroyAccelerationStructureKHR(vk_core.device, model->as, NULL);
memset(model, 0, sizeof(*model));
}
// Recreate tlas
// Why here and not in init: to make sure that its memory is preserved. Map init will clear all memory regions.
{
@ -362,16 +369,6 @@ void VK_RayNewMap( void ) {
g_rtx.tlas = VK_NULL_HANDLE;
}
// Clear BLAS cache
for (int i = 0; i < ARRAYSIZE(g_rtx.blas_cache.accels); ++i) {
vk_accel_t *a = g_rtx.blas_cache.accels + i;
if (a->as == VK_NULL_HANDLE)
break;
vkDestroyAccelerationStructureKHR(vk_core.device, a->as, NULL);
memset(a, 0, sizeof(*a));
}
const VkAccelerationStructureGeometryKHR tl_geom[] = {
{
.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR,
@ -399,7 +396,6 @@ void VK_RayNewMap( void ) {
};
if (!createOrUpdateAccelerationStructure(VK_NULL_HANDLE, &asrgs)) {
gEngine.Host_Error("Could not create TLAS\n");
return false;
}
}
@ -439,15 +435,13 @@ void VK_RayFrameBegin( void )
// so we can be sure here that previous frame is complete and we're free to
// destroy/reuse dynamic ASes from previous frame
for (int i = 0; i < g_rtx.frame.num_models; ++i) {
vk_ray_model_t *model = g_rtx.frame.models + i;
if (!model->dynamic)
continue;
if (model->accel == NULL)
vk_ray_draw_model_t *model = g_rtx.frame.models + i;
ASSERT(model->model);
if (!model->model->dynamic)
continue;
ASSERT(model->cache_accel);
returnBlasToCache(model->cache_accel);
model->cache_accel = NULL;
returnModelToCache(model->model);
model->model = NULL;
}
g_rtx.frame.scratch_offset = 0;
@ -461,11 +455,6 @@ void VK_RayFrameBegin( void )
VK_RingBuffer_ClearFrame(&g_rtx.kusochki_alloc);
}
void VK_RayFrameAddModelDynamic( VkCommandBuffer cmdbuf, const vk_ray_model_dynamic_t *dynamic)
{
PRINT_NOT_IMPLEMENTED();
}
static void createPipeline( void )
{
const vk_pipeline_compute_create_info_t ci = {
@ -481,21 +470,16 @@ static void validateModelData( void ) {
const vk_kusok_data_t* kusochki = g_rtx.kusochki_buffer.mapped;
ASSERT(g_rtx.frame.num_models <= ARRAYSIZE(g_rtx.frame.models));
for (int i = 0; i < g_rtx.frame.num_models; ++i) {
const vk_ray_model_t *model = g_rtx.frame.models + i;
const vk_ray_draw_model_t *draw_model = g_rtx.frame.models + i;
const vk_ray_model_t *model = draw_model->model;
int num_geoms = 1; // TODO can't validate non-dynamic models because this info is lost
ASSERT(model->accel != VK_NULL_HANDLE);
ASSERT(model);
ASSERT(model->as != VK_NULL_HANDLE);
ASSERT(model->kusochki_offset < MAX_KUSOCHKI);
if (model->dynamic) {
ASSERT(model->cache_accel);
ASSERT(model->cache_accel->as == model->accel);
ASSERT(model->cache_accel->geoms);
ASSERT(model->cache_accel->num_geoms > 0);
ASSERT(model->cache_accel->taken);
num_geoms = model->cache_accel->num_geoms;
} else {
ASSERT(!model->cache_accel);
}
ASSERT(model->geoms);
ASSERT(model->num_geoms > 0);
ASSERT(model->taken);
num_geoms = model->num_geoms;
for (int j = 0; j < num_geoms; j++) {
const vk_kusok_data_t *kusok = kusochki + j;
@ -539,15 +523,15 @@ void VK_RayFrameEnd(const vk_ray_frame_render_args_t* args)
{
VkAccelerationStructureInstanceKHR* inst = g_rtx.tlas_geom_buffer.mapped;
for (int i = 0; i < g_rtx.frame.num_models; ++i) {
const vk_ray_model_t* const model = g_rtx.frame.models + i;
ASSERT(model->accel != VK_NULL_HANDLE);
//gEngine.Con_Reportf(" %d: AS=%p\n", i, model->accel);
const vk_ray_draw_model_t* const model = g_rtx.frame.models + i;
ASSERT(model->model);
ASSERT(model->model->as != VK_NULL_HANDLE);
inst[i] = (VkAccelerationStructureInstanceKHR){
.instanceCustomIndex = model->kusochki_offset,
.instanceCustomIndex = model->model->kusochki_offset,
.mask = 0xff,
.instanceShaderBindingTableRecordOffset = 0,
.flags = 0,
.accelerationStructureReference = getASAddress(model->accel), // TODO cache this addr
.accelerationStructureReference = getASAddress(model->model->as), // TODO cache this addr
};
memcpy(&inst[i].transform, model->transform_row, sizeof(VkTransformMatrixKHR));
}
@ -954,8 +938,6 @@ qboolean VK_RayInit( void )
VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT);
}
memset(g_rtx.blas_cache.accels, 0, sizeof(g_rtx.blas_cache.accels));
// Start with black previous frame
{
const vk_image_t *frame_src = g_rtx.frames + 1;
@ -1019,10 +1001,11 @@ void VK_RayShutdown( void )
if (g_rtx.tlas != VK_NULL_HANDLE)
vkDestroyAccelerationStructureKHR(vk_core.device, g_rtx.tlas, NULL);
for (int i = 0; i < ARRAYSIZE(g_rtx.blas_cache.accels); ++i) {
VkAccelerationStructureKHR as = g_rtx.blas_cache.accels[i].as;
if (as != VK_NULL_HANDLE)
vkDestroyAccelerationStructureKHR(vk_core.device, as, NULL);
for (int i = 0; i < ARRAYSIZE(g_rtx.models_cache); ++i) {
vk_ray_model_t *model = g_rtx.models_cache + i;
if (model->as != VK_NULL_HANDLE)
vkDestroyAccelerationStructureKHR(vk_core.device, model->as, NULL);
model->as = VK_NULL_HANDLE;
}
destroyBuffer(&g_rtx.scratch_buffer);
@ -1033,20 +1016,20 @@ void VK_RayShutdown( void )
destroyBuffer(&g_rtx.light_grid_buffer);
}
qboolean VK_RayModelInit( vk_ray_model_init_t args ) {
vk_ray_model_t* VK_RayModelInit( vk_ray_model_init_t args ) {
VkAccelerationStructureGeometryKHR *geoms;
uint32_t *geom_max_prim_counts;
VkAccelerationStructureBuildRangeInfoKHR *geom_build_ranges;
VkAccelerationStructureBuildRangeInfoKHR **geom_build_ranges_ptr;
const VkDeviceAddress buffer_addr = getBufferDeviceAddress(args.buffer);
vk_kusok_data_t *kusochki;
qboolean result;
const uint32_t kusochki_count_offset = VK_RingBuffer_Alloc(&g_rtx.kusochki_alloc, args.model->num_geometries, 1);
vk_ray_model_t *ray_model;
ASSERT(vk_core.rtx);
if (g_rtx.freeze_models)
return true;
return args.model->ray_model;
if (kusochki_count_offset == AllocFailed) {
gEngine.Con_Printf(S_ERROR "Maximum number of kusochki exceeded on model %s\n", args.model->debug_name);
@ -1060,7 +1043,6 @@ qboolean VK_RayModelInit( vk_ray_model_init_t args ) {
geom_build_ranges_ptr = Mem_Malloc(vk_core.pool, args.model->num_geometries * sizeof(*geom_build_ranges));
kusochki = (vk_kusok_data_t*)(g_rtx.kusochki_buffer.mapped) + kusochki_count_offset;
args.model->rtx.kusochki_offset = kusochki_count_offset;
for (int i = 0; i < args.model->num_geometries; ++i) {
const vk_render_geometry_t *mg = args.model->geometries + i;
@ -1112,7 +1094,7 @@ qboolean VK_RayModelInit( vk_ray_model_init_t args ) {
for (int j = 0; j < g_lights.num_emissive_surfaces; ++j) {
if (mg->surface_index == g_lights.emissive_surfaces[j].surface_index) {
VectorCopy(g_lights.emissive_surfaces[j].emissive, ek->kusochki[j].emissive_color);
ek->kusochki[j].kusok_index = i + args.model->rtx.kusochki_offset;
ek->kusochki[j].kusok_index = i + kusochki_count_offset;
break;
}
}
@ -1120,9 +1102,6 @@ qboolean VK_RayModelInit( vk_ray_model_init_t args ) {
}
{
vk_accel_t *cache_accel = NULL;
VkAccelerationStructureKHR as = VK_NULL_HANDLE;
as_build_args_t asrgs = {
.geoms = geoms,
.max_prim_counts = geom_max_prim_counts,
@ -1130,74 +1109,68 @@ qboolean VK_RayModelInit( vk_ray_model_init_t args ) {
.n_geoms = args.model->num_geometries,
.type = VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR,
.dynamic = args.model->dynamic,
.p_accel = &as,
.debug_name = args.model->debug_name,
};
ray_model = getModelFromCache(args.model->num_geometries, geoms); //, build_size.accelerationStructureSize);
if (!ray_model) {
gEngine.Con_Printf(S_ERROR "Ran out of model cache slots\n");
} else {
qboolean result;
asrgs.p_accel = &ray_model->as;
// TODO batch building multiple blases together
const VkCommandBufferBeginInfo beginfo = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
};
XVK_CHECK(vkBeginCommandBuffer(vk_core.cb, &beginfo));
// TODO batch building multiple blases together
const VkCommandBufferBeginInfo beginfo = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
};
XVK_CHECK(vkBeginCommandBuffer(vk_core.cb, &beginfo));
result = createOrUpdateAccelerationStructure(vk_core.cb, &asrgs);
XVK_CHECK(vkEndCommandBuffer(vk_core.cb));
if (args.model->dynamic) {
// can allow updates only if we know that we only touch vertex positions essentially
// (no geometry/instance count, flags, etc changes are allowed by the spec)
cache_accel = getBlasFromCache(args.model->num_geometries, geoms);//, build_size.accelerationStructureSize);
if (!cache_accel) {
gEngine.Con_Printf(S_ERROR "Ran out of BLAS cache slots\n");
// FIXME free temp mem
return false;
if (!result)
{
gEngine.Con_Printf(S_ERROR "Could not build BLAS for %s\n", args.model->debug_name);
returnModelToCache(ray_model);
ray_model = NULL;
} else {
const VkSubmitInfo subinfo = {
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.commandBufferCount = 1,
.pCommandBuffers = &vk_core.cb,
};
XVK_CHECK(vkQueueSubmit(vk_core.queue, 1, &subinfo, VK_NULL_HANDLE));
XVK_CHECK(vkQueueWaitIdle(vk_core.queue));
g_rtx.frame.scratch_offset = 0;
ray_model->kusochki_offset = kusochki_count_offset;
ray_model->dynamic = args.model->dynamic;
}
as = cache_accel->as;
}
result = createOrUpdateAccelerationStructure(vk_core.cb, &asrgs);
XVK_CHECK(vkEndCommandBuffer(vk_core.cb));
args.model->rtx.blas = as;
args.model->rtx.cache_accel = cache_accel;
if (cache_accel)
cache_accel->as = as;
}
{
const VkSubmitInfo subinfo = {
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.commandBufferCount = 1,
.pCommandBuffers = &vk_core.cb,
};
XVK_CHECK(vkQueueSubmit(vk_core.queue, 1, &subinfo, VK_NULL_HANDLE));
XVK_CHECK(vkQueueWaitIdle(vk_core.queue));
g_rtx.frame.scratch_offset = 0;
}
Mem_Free(geom_build_ranges_ptr);
Mem_Free(geom_build_ranges);
Mem_Free(geom_max_prim_counts);
Mem_Free(geoms);
Mem_Free(geoms); // TODO this can be cached within models_cache ??
//gEngine.Con_Reportf("Model %s (%p) created blas %p\n", args.model->debug_name, args.model, args.model->rtx.blas);
return result;
return ray_model;
}
void VK_RayModelDestroy( struct vk_render_model_s *model ) {
void VK_RayModelDestroy( struct vk_ray_model_s *model ) {
ASSERT(!g_rtx.freeze_models);
ASSERT(vk_core.rtx);
if (model->rtx.blas != VK_NULL_HANDLE) {
// gEngine.Con_Reportf("Model %s destroying AS=%p blas_index=%d\n", model->debug_name, model->rtx.blas, blas_index);
if (model->as != VK_NULL_HANDLE) {
//gEngine.Con_Reportf("Model %s destroying AS=%p blas_index=%d\n", model->debug_name, model->rtx.blas, blas_index);
vkDestroyAccelerationStructureKHR(vk_core.device, model->rtx.blas, NULL);
model->rtx.blas = VK_NULL_HANDLE;
vkDestroyAccelerationStructureKHR(vk_core.device, model->as, NULL);
memset(model, 0, sizeof(*model));
}
}
void VK_RayFrameAddModel( const struct vk_render_model_s *model, const matrix3x4 *transform_row ) {
void VK_RayFrameAddModel( vk_ray_model_t *model, const matrix3x4 *transform_row ) {
ASSERT(vk_core.rtx);
ASSERT(g_rtx.frame.num_models <= ARRAYSIZE(g_rtx.frame.models));
@ -1211,13 +1184,10 @@ void VK_RayFrameAddModel( const struct vk_render_model_s *model, const matrix3x4
}
{
vk_ray_model_t* ray_model = g_rtx.frame.models + g_rtx.frame.num_models;
ASSERT(model->rtx.blas != VK_NULL_HANDLE);
ray_model->accel = model->rtx.blas;
ray_model->kusochki_offset = model->rtx.kusochki_offset;
ray_model->dynamic = model->dynamic;
ray_model->cache_accel = model->rtx.cache_accel;
memcpy(ray_model->transform_row, *transform_row, sizeof(ray_model->transform_row));
vk_ray_draw_model_t* draw_model = g_rtx.frame.models + g_rtx.frame.num_models;
ASSERT(model->as != VK_NULL_HANDLE);
draw_model->model = model;
memcpy(draw_model->transform_row, *transform_row, sizeof(draw_model->transform_row));
g_rtx.frame.num_models++;
}
}

22
ref_vk/vk_rtx.h
View File

@ -3,30 +3,18 @@
#include "vk_core.h"
struct vk_render_model_s;
struct vk_ray_model_s;
typedef struct {
struct vk_render_model_s *model;
VkBuffer buffer;
VkBuffer buffer; // TODO must be uniform for all models. Shall we read it directly from vk_render?
} vk_ray_model_init_t;
qboolean VK_RayModelInit( vk_ray_model_init_t model_init);
void VK_RayModelDestroy( struct vk_render_model_s *model );
typedef struct {
//int lightmap, texture;
//int render_mode;
int texture_id;
uint32_t max_vertex;
uint32_t element_count;
uint32_t index_offset, vertex_offset;
VkBuffer buffer;
const matrix3x4 *transform_row;
struct { float r,g,b; } emissive;
} vk_ray_model_dynamic_t;
struct vk_ray_model_s *VK_RayModelInit( vk_ray_model_init_t model_init );
void VK_RayModelDestroy( struct vk_ray_model_s *model );
void VK_RayFrameBegin( void );
void VK_RayFrameAddModel( const struct vk_render_model_s *model, const matrix3x4 *transform_row );
void VK_RayFrameAddModelDynamic(VkCommandBuffer cmdbuf, const vk_ray_model_dynamic_t* model);
void VK_RayFrameAddModel( struct vk_ray_model_s *model, const matrix3x4 *transform_row );
typedef struct {
VkCommandBuffer cmdbuf;