Half-Life-RTX/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/w23/xash3d-fwgs synced 2024-12-16 06:00:33 +01:00
Code Issues Projects Releases Wiki Activity

rtx: calculate maxVertex correctly

Browse Source 
after we've updated how brush index buffer references vertices to allow
for draw call coalescing ray tracing broke on amd.
this is because amd cards expect a correct value in
VkAccelerationStructureGeometryTrianglesDataKHR::maxVertex. make sure we
fill a correct value there.
This commit is contained in:
Ivan Avdeev 2021-08-18 09:17:48 -07:00 committed by Ivan Avdeev
parent 93cab236ba
commit 76b82ac884
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ref_vk/vk_beams.c
View File

@ -385,7 +385,7 @@ static void R_DrawSegs( vec3_t source, vec3_t delta, float width, float scale, f
.texture = texture, .texture = texture,
.material = kXVkMaterialDiffuse, .material = kXVkMaterialDiffuse,
.vertex_count = total_vertices, .max_vertex = total_vertices,
.vertex_offset = vertex_buffer.buffer.unit.offset, .vertex_offset = vertex_buffer.buffer.unit.offset,
.element_count = total_indices, .element_count = total_indices,

4
ref_vk/vk_brush.c
View File

@ -208,7 +208,7 @@ static void EmitWaterPolys( const cl_entity_t *ent, const msurface_t *warp, qboo
.texture = warp->texinfo->texture->gl_texturenum, // FIXME assert >= 0 .texture = warp->texinfo->texture->gl_texturenum, // FIXME assert >= 0
.material = kXVkMaterialWater, .material = kXVkMaterialWater,
.vertex_count = num_vertices, .max_vertex = num_vertices,
.vertex_offset = vertex_buffer.buffer.unit.offset, .vertex_offset = vertex_buffer.buffer.unit.offset,
.element_count = num_indices, .element_count = num_indices,
@ -477,7 +477,7 @@ static qboolean loadBrushSurfaces( model_sizes_t sizes, const model_t *mod ) {
model_geometry->texture = surf->texinfo->texture->gl_texturenum; model_geometry->texture = surf->texinfo->texture->gl_texturenum;
model_geometry->vertex_offset = vertex_buffer.buffer.unit.offset; model_geometry->vertex_offset = vertex_buffer.buffer.unit.offset;
model_geometry->vertex_count = surf->numedges; model_geometry->max_vertex = vertex_offset + surf->numedges;
model_geometry->index_offset = index_offset; model_geometry->index_offset = index_offset;

4
ref_vk/vk_ray_model.c
View File

@ -191,7 +191,7 @@ vk_ray_model_t* VK_RayModelCreate( vk_ray_model_init_t args ) {
(VkAccelerationStructureGeometryTrianglesDataKHR){ (VkAccelerationStructureGeometryTrianglesDataKHR){
.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR, .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR,
.indexType = VK_INDEX_TYPE_UINT16, .indexType = VK_INDEX_TYPE_UINT16,
.maxVertex = mg->vertex_count, .maxVertex = mg->max_vertex,
.vertexFormat = VK_FORMAT_R32G32B32_SFLOAT, .vertexFormat = VK_FORMAT_R32G32B32_SFLOAT,
.vertexStride = sizeof(vk_vertex_t), .vertexStride = sizeof(vk_vertex_t),
.vertexData.deviceAddress = buffer_addr, .vertexData.deviceAddress = buffer_addr,
@ -384,4 +384,4 @@ void XVK_RayModel_ClearForNextFrame( void )
// proper fix would need some other memory allocation strategy // proper fix would need some other memory allocation strategy
// VK_RingBuffer_ClearFrame(&g_rtx.accels_buffer_alloc); // VK_RingBuffer_ClearFrame(&g_rtx.accels_buffer_alloc);
VK_RingBuffer_ClearFrame(&g_ray_model_state.kusochki_alloc); VK_RingBuffer_ClearFrame(&g_ray_model_state.kusochki_alloc);
} }

4
ref_vk/vk_render.h
View File

@ -76,7 +76,9 @@ typedef struct {
XVkMaterialType material; XVkMaterialType material;
uint32_t element_count; uint32_t element_count;
uint32_t vertex_count;
// Maximum index of vertex used for this geometry; needed for ray tracing BLAS building
uint32_t max_vertex;
// Non-null only for brush models // Non-null only for brush models
// Used for: // Used for:

2
ref_vk/vk_sprite.c
View File

@ -707,7 +707,7 @@ static void R_DrawSpriteQuad( const char *debug_name, mspriteframe_t *frame, vec
.texture = texture, .texture = texture,
.material = kXVkMaterialDiffuse, .material = kXVkMaterialDiffuse,
.vertex_count = 4, .max_vertex = 4,
.vertex_offset = vertex_buffer.buffer.unit.offset, .vertex_offset = vertex_buffer.buffer.unit.offset,
.element_count = 6, .element_count = 6,

2
ref_vk/vk_studio.c
View File

@ -2005,7 +2005,7 @@ static void R_StudioDrawNormalMesh( short *ptricmds, vec3_t *pstudionorms, float
.material = kXVkMaterialDiffuse, .material = kXVkMaterialDiffuse,
.vertex_offset = vertex_buffer.buffer.unit.offset, .vertex_offset = vertex_buffer.buffer.unit.offset,
.vertex_count = num_vertices, .max_vertex = num_vertices,
.index_offset = index_buffer.buffer.unit.offset, .index_offset = index_buffer.buffer.unit.offset,
.element_count = num_indices, .element_count = num_indices,