Primitive storage and static model improvements

src/refresh/vkpt/bsp_mesh.c

@@ -652,7 +652,7 @@ collect_surfaces(int *idx_ctr, bsp_mesh_t *wm, bsp_t *bsp, int model_idx, int (*
 			material_id = (material_id & ~MATERIAL_LIGHT_STYLE_MASK) | ((camera_id << MATERIAL_LIGHT_STYLE_SHIFT) & MATERIAL_LIGHT_STYLE_MASK);
 		}
 
-		if (*idx_ctr + create_poly(bsp, surf, material_id, NULL, NULL, NULL, NULL, NULL, NULL) >= MAX_VERT_BSP) {
+		if (*idx_ctr + create_poly(bsp, surf, material_id, NULL, NULL, NULL, NULL, NULL, NULL) >= MAX_PRIM_BSP * 3) {
 			Com_Error(ERR_FATAL, "error: exceeding max vertex limit\n");
 		}
 
@@ -1354,7 +1354,7 @@ compute_world_tangents(bsp_t* bsp, bsp_mesh_t* wm)
 	// compute tangent space
 	uint32_t ntriangles = wm->num_indices / 3;
 
-	wm->texel_density = Z_Malloc(MAX_VERT_BSP * sizeof(float) / 3);
+	wm->texel_density = Z_Malloc(MAX_PRIM_BSP * sizeof(float));
 
 	for (int idx_tri = 0; idx_tri < ntriangles; ++idx_tri)
 	{
@@ -1876,13 +1876,13 @@ bsp_mesh_create_from_bsp(bsp_mesh_t *wm, bsp_t *bsp, const char* map_name)
 
     wm->num_vertices = 0;
     wm->num_indices = 0;
-    wm->positions = Z_Malloc(MAX_VERT_BSP * 3 * sizeof(*wm->positions));
-    wm->tex_coords = Z_Malloc(MAX_VERT_BSP * 2 * sizeof(*wm->tex_coords));
-	wm->normals = Z_Malloc(MAX_VERT_BSP * sizeof(uint32_t));
-	wm->tangents = Z_Malloc(MAX_VERT_BSP * sizeof(uint32_t));
-    wm->materials = Z_Malloc(MAX_VERT_BSP / 3 * sizeof(*wm->materials));
-    wm->clusters = Z_Malloc(MAX_VERT_BSP / 3 * sizeof(*wm->clusters));
-	wm->emissive_factors = Z_Malloc(MAX_VERT_BSP / 3 * sizeof(*wm->emissive_factors));
+    wm->positions = Z_Malloc(MAX_PRIM_BSP * 9 * sizeof(*wm->positions));
+    wm->tex_coords = Z_Malloc(MAX_PRIM_BSP * 6 * sizeof(*wm->tex_coords));
+	wm->normals = Z_Malloc(MAX_PRIM_BSP * 3 * sizeof(uint32_t));
+	wm->tangents = Z_Malloc(MAX_PRIM_BSP * 3 * sizeof(uint32_t));
+    wm->materials = Z_Malloc(MAX_PRIM_BSP * sizeof(*wm->materials));
+    wm->clusters = Z_Malloc(MAX_PRIM_BSP * sizeof(*wm->clusters));
+	wm->emissive_factors = Z_Malloc(MAX_PRIM_BSP * sizeof(*wm->emissive_factors));
 
 	// clear these here because `bsp_mesh_load_custom_sky` creates lights before `collect_light_polys`
 	wm->num_light_polys = 0;
@@ -1952,7 +1952,7 @@ bsp_mesh_create_from_bsp(bsp_mesh_t *wm, bsp_t *bsp, const char* map_name)
 
 	compute_world_tangents(bsp, wm);
 
-    if (wm->num_vertices >= MAX_VERT_BSP) {
+    if (wm->num_vertices >= MAX_PRIM_BSP * 3) {
 		Com_Error(ERR_FATAL, "The BSP model has too many vertices (%d)", wm->num_vertices);
 	}
 

src/refresh/vkpt/main.c

@@ -4017,7 +4017,7 @@ R_BeginRegistration_RTX(const char *name)
 	bsp_mesh_create_from_bsp(&vkpt_refdef.bsp_mesh_world, bsp, name);
 	vkpt_light_stats_create(&vkpt_refdef.bsp_mesh_world);
 	_VK(vkpt_vertex_buffer_upload_bsp_mesh_to_staging(&vkpt_refdef.bsp_mesh_world));
-	_VK(vkpt_vertex_buffer_bsp_upload_staging());
+	_VK(vkpt_vertex_buffer_bsp_upload_staging(vkpt_refdef.bsp_mesh_world.num_vertices / 3));
 	vkpt_refdef.bsp_mesh_world_loaded = 1;
 	bsp = NULL;
 	world_anim_frame = 0;

src/refresh/vkpt/path_tracer.c

@@ -687,35 +687,35 @@ vkpt_pt_create_static(
 	int num_vertices_custom_sky)
 {
 	VkCommandBuffer cmd_buf = vkpt_begin_command_buffer(&qvk.cmd_buffers_graphics);
-	VkDeviceAddress address_vertex = offsetof(BspVertexBuffer, positions_bsp);
+	VkDeviceAddress address_vertex = 0;
 
 	scratch_buf_ptr = 0;
 
-	VkResult ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_bsp, address_vertex, NULL, 0, num_vertices, 0, &blas_static, qfalse, qfalse);
+	VkResult ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_world, address_vertex, NULL, 0, num_vertices, 0, &blas_static, qfalse, qfalse);
 
 	MEM_BARRIER_BUILD_ACCEL(cmd_buf);
 	address_vertex += num_vertices * sizeof(float) * 3;
 	scratch_buf_ptr = 0;
 
-	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_bsp, address_vertex, NULL, 0, num_vertices_transparent, 0, &blas_transparent, qfalse, qfalse);
+	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_world, address_vertex, NULL, 0, num_vertices_transparent, 0, &blas_transparent, qfalse, qfalse);
 
 	MEM_BARRIER_BUILD_ACCEL(cmd_buf);
 	address_vertex += num_vertices_transparent * sizeof(float) * 3;
 	scratch_buf_ptr = 0;
 
-	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_bsp, address_vertex, NULL, 0, num_vertices_masked, 0, &blas_masked, qfalse, qfalse);
+	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_world, address_vertex, NULL, 0, num_vertices_masked, 0, &blas_masked, qfalse, qfalse);
 
 	MEM_BARRIER_BUILD_ACCEL(cmd_buf);
 	address_vertex += num_vertices_masked * sizeof(float) * 3;
 	scratch_buf_ptr = 0;
 
-	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_bsp, address_vertex, NULL, 0, num_vertices_sky, 0, &blas_sky, qfalse, qfalse);
+	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_world, address_vertex, NULL, 0, num_vertices_sky, 0, &blas_sky, qfalse, qfalse);
 
 	MEM_BARRIER_BUILD_ACCEL(cmd_buf);
 	address_vertex += num_vertices_sky * sizeof(float) * 3;
 	scratch_buf_ptr = 0;
 
-	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_bsp, address_vertex, NULL, 0, num_vertices_custom_sky, 0, &blas_custom_sky, qfalse, qfalse);
+	ret = vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_world, address_vertex, NULL, 0, num_vertices_custom_sky, 0, &blas_custom_sky, qfalse, qfalse);
 
 	MEM_BARRIER_BUILD_ACCEL(cmd_buf);
 	address_vertex += num_vertices_custom_sky * sizeof(float) * 3;
@@ -740,30 +740,30 @@ vkpt_pt_create_all_dynamic(
 {
 	scratch_buf_ptr = 0;
 
-	uint64_t offset_vertex_base = offsetof(ModelDynamicVertexBuffer, positions_instanced);
+	uint64_t offset_vertex_base = 0;
 	uint64_t offset_vertex = offset_vertex_base;
 	uint64_t offset_index = 0;
-	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_model_dynamic, offset_vertex, NULL, offset_index, upload_info->dynamic_vertex_num, 0, blas_dynamic + idx, qtrue, qtrue);
+	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_instanced, offset_vertex, NULL, offset_index, upload_info->dynamic_vertex_num, 0, blas_dynamic + idx, qtrue, qtrue);
 
 	transparent_model_primitive_offset = upload_info->transparent_model_vertex_offset / 3;
 	offset_vertex = offset_vertex_base + upload_info->transparent_model_vertex_offset * sizeof(float) * 3;
-	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_model_dynamic, offset_vertex, NULL, offset_index, upload_info->transparent_model_vertex_num, 0, blas_transparent_models + idx, qtrue, qtrue);
+	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_instanced, offset_vertex, NULL, offset_index, upload_info->transparent_model_vertex_num, 0, blas_transparent_models + idx, qtrue, qtrue);
 
 	masked_model_primitive_offset = upload_info->masked_model_vertex_offset / 3;
 	offset_vertex = offset_vertex_base + upload_info->masked_model_vertex_offset * sizeof(float) * 3;
-	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_model_dynamic, offset_vertex, NULL, offset_index, upload_info->masked_model_vertex_num, 0, blas_masked_models + idx, qtrue, qtrue);
+	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_instanced, offset_vertex, NULL, offset_index, upload_info->masked_model_vertex_num, 0, blas_masked_models + idx, qtrue, qtrue);
 
 	viewer_model_primitive_offset = upload_info->viewer_model_vertex_offset / 3;
 	offset_vertex = offset_vertex_base + upload_info->viewer_model_vertex_offset * sizeof(float) * 3;
-	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_model_dynamic, offset_vertex, NULL, offset_index, upload_info->viewer_model_vertex_num, 0, blas_viewer_models + idx, qtrue, qtrue);
+	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_instanced, offset_vertex, NULL, offset_index, upload_info->viewer_model_vertex_num, 0, blas_viewer_models + idx, qtrue, qtrue);
 
 	viewer_weapon_primitive_offset = upload_info->viewer_weapon_vertex_offset / 3;
 	offset_vertex = offset_vertex_base + upload_info->viewer_weapon_vertex_offset * sizeof(float) * 3;
-	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_model_dynamic, offset_vertex, NULL, offset_index, upload_info->viewer_weapon_vertex_num, 0, blas_viewer_weapon + idx, qtrue, qtrue);
+	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_instanced, offset_vertex, NULL, offset_index, upload_info->viewer_weapon_vertex_num, 0, blas_viewer_weapon + idx, qtrue, qtrue);
 
 	explosions_primitive_offset = upload_info->explosions_vertex_offset / 3;
 	offset_vertex = offset_vertex_base + upload_info->explosions_vertex_offset * sizeof(float) * 3;
-	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_vertex_model_dynamic, offset_vertex, NULL, offset_index, upload_info->explosions_vertex_num, 0, blas_explosions + idx, qtrue, qtrue);
+	vkpt_pt_create_accel_bottom(cmd_buf, &qvk.buf_positions_instanced, offset_vertex, NULL, offset_index, upload_info->explosions_vertex_num, 0, blas_explosions + idx, qtrue, qtrue);
 
 	BufferResource_t* buffer_vertex = NULL;
 	BufferResource_t* buffer_index = NULL;

src/refresh/vkpt/shader/animate_materials.comp

@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #version 460
 #extension GL_GOOGLE_include_directive    : enable
+#extension GL_EXT_nonuniform_qualifier    : enable
 
 #include "utils.glsl"
 
@@ -41,7 +42,7 @@ main()
 	if(prim >= global_ubo.num_static_primitives)
 		return;
 
-	uint material = get_materials_bsp(prim);
+	uint material = primitive_buffers[VERTEX_BUFFER_WORLD].primitives[prim].material_id;
 	uint new_material = material;
 	MaterialInfo minfo = get_material_info(material);
 
@@ -59,7 +60,7 @@ main()
 
 	if(new_material != material)
 	{
-		set_materials_bsp(prim, new_material);
+		primitive_buffers[VERTEX_BUFFER_WORLD].primitives[prim].material_id = new_material;
 	}
 }
 

src/refresh/vkpt/shader/asvgf_gradient_reproject.comp

@@ -63,18 +63,18 @@ void patch_position(ivec2 ipos, ivec2 found_pos_prev)
 	// Read the visibility buffer
 	uvec2 vis_buf = texelFetch(TEX_PT_VISBUF_B, found_pos_prev, 0).xy;
 
-	Triangle triangle;
+	uint buffer_idx;
+	uint primitive_id;
 
 	if (visbuf_is_static_prim(vis_buf.x))
 	{
-		uint primitive_id = visbuf_get_static_prim(vis_buf.x);
-		triangle = get_bsp_triangle(primitive_id);
+		primitive_id = visbuf_get_static_prim(vis_buf.x);
+		buffer_idx = VERTEX_BUFFER_WORLD;
 	}
 	else
 	{
 		uint instance_id_prev = visbuf_get_instance_id(vis_buf.x);
 		uint triangle_idx = visbuf_get_instance_prim(vis_buf.x);
-		uint primitive_id;
 
 		// Map the dynamic objects geometry data from the previous frame into the current frame
 		if (visbuf_is_world_instance(vis_buf.x))
@@ -100,9 +100,11 @@ void patch_position(ivec2 ipos, ivec2 found_pos_prev)
 			primitive_id = buf_offset + triangle_idx;
 		}
 
-		triangle = get_instanced_triangle(primitive_id);
+		buffer_idx = VERTEX_BUFFER_INSTANCED;
 	}
 
+	Triangle triangle = load_triangle(buffer_idx, primitive_id);
+
 	vec3 bary = visbuf_unpack_barycentrics(vis_buf.y);
 
 	// Reconstruct the position based on the barycentrics

src/refresh/vkpt/shader/instance_geometry.comp

@@ -105,8 +105,9 @@ get_model_triangle(uint model_id, uint prim_id, uint idx_offset, uint vert_offse
 	t.tangents[2] = vec3(0);
 
 	t.material_id = 0; // needs to come from uniform buffer
-
-	t.alpha = 1.0;
+	t.cluster = ~0u;
+	t.instance = 0;
+	t.emissive_factor = 1;
 	t.texel_density = 0;
 
 	return t;
@@ -209,8 +210,9 @@ get_iqm_triangle(uint model_id, uint prim_id, uint idx_offset, uint vert_offset,
 	}
 
 	t.material_id = 0; // needs to come from uniform buffer
-
-	t.alpha = 1.0;
+	t.cluster = ~0u;
+	t.instance = 0;
+	t.emissive_factor = 1;
 	t.texel_density = 0;
 
 	return t;
@@ -251,7 +253,7 @@ main()
 
 		if(is_world) {
 			uint id = instance_id;
-			Triangle t = get_bsp_triangle(idx + instance_buffer.bsp_prim_offset[id]);
+			Triangle t = load_triangle(VERTEX_BUFFER_WORLD, idx + instance_buffer.bsp_prim_offset[id]);
 			M_curr = instance_buffer.bsp_mesh_instances[id].M;
 			uint id_prev = instance_buffer.world_current_to_prev[id];
 			M_prev = instance_buffer.bsp_mesh_instances_prev[id_prev].M;
@@ -311,7 +313,7 @@ main()
 					M_prev = M_curr;
 				}
 
-				t_i.alpha = mi_curr.alpha.x;
+				t_i.emissive_factor = mi_curr.alpha.x;
 				t_i.material_id = mi_curr.material;
 				// t_i.material_id |= MATERIAL_FLAG_HANDEDNESS; // not sure
 				t_i.cluster = instance_buffer.model_cluster_id[instance_id];
@@ -340,8 +342,8 @@ main()
 					t_i.tangents[1].xyz = t_i.tangents[0].xyz;
 					t_i.tangents[2].xyz = t_i.tangents[0].xyz;
 
-					t_i.alpha = mi_curr.alpha.x;
-					t_i.texel_density  = t.texel_density;
+					t_i.emissive_factor = mi_curr.alpha.x;
+					t_i.texel_density = t.texel_density;
 
 					t_i.material_id = mi_curr.material;
 					t_i.material_id |= handedness ? MATERIAL_FLAG_HANDEDNESS : 0;
@@ -388,7 +390,8 @@ main()
 		t_i.tangents[1] = vec3(M_curr * vec4(t_i.tangents[1], 0.0));
 		t_i.tangents[2] = vec3(M_curr * vec4(t_i.tangents[2], 0.0));
 
-		uint instance_triangle_id = visbuf_pack_instance(instance_id, idx, is_world);
-		store_instanced_triangle(t_i, instance_triangle_id, idx + buf_offset);
+		t_i.instance = visbuf_pack_instance(instance_id, idx, is_world);
+
+		store_triangle(t_i, VERTEX_BUFFER_INSTANCED, idx + buf_offset);	
 	}
 }

src/refresh/vkpt/shader/path_tracer_hit_shaders.h

@@ -46,12 +46,9 @@ void pt_logic_rchit(inout RayPayloadGeometry ray_payload, int primitiveID, uint
 
 bool pt_logic_masked(int primitiveID, uint instanceCustomIndex, vec2 bary)
 {
-	Triangle triangle;
 	uint prim = primitiveID + instanceCustomIndex & AS_INSTANCE_MASK_OFFSET;
-	if ((instanceCustomIndex & AS_INSTANCE_FLAG_DYNAMIC) != 0)
-		triangle = get_instanced_triangle(prim);
-	else
-		triangle = get_bsp_triangle(prim);
+	uint buffer_idx = (instanceCustomIndex & AS_INSTANCE_FLAG_DYNAMIC) != 0 ? VERTEX_BUFFER_INSTANCED : VERTEX_BUFFER_WORLD;
+	Triangle triangle = load_triangle(buffer_idx, prim);
 
 	MaterialInfo minfo = get_material_info(triangle.material_id);
 
@@ -156,7 +153,7 @@ vec4 pt_logic_sprite(int primitiveID, vec2 bary)
 vec4 pt_logic_explosion(int primitiveID, uint instanceCustomIndex, vec3 worldRayDirection, vec2 bary)
 {
 	const uint primitive_id = primitiveID + instanceCustomIndex & AS_INSTANCE_MASK_OFFSET;
-	const Triangle triangle = get_instanced_triangle(primitive_id);
+	const Triangle triangle = load_triangle(VERTEX_BUFFER_INSTANCED, primitive_id);
 
 	const vec3 barycentric = vec3(1.0 - bary.x - bary.y, bary.x, bary.y);
 	const vec2 tex_coord = triangle.tex_coords * barycentric;
@@ -167,11 +164,11 @@ vec4 pt_logic_explosion(int primitiveID, uint instanceCustomIndex, vec3 worldRay
 	if((triangle.material_id & MATERIAL_KIND_MASK) == MATERIAL_KIND_EXPLOSION)
 	{
 		const vec3 normal = triangle.normals * barycentric;
-		emission.rgb = mix(emission.rgb, get_explosion_color(normal, worldRayDirection.xyz), triangle.alpha);
+		emission.rgb = mix(emission.rgb, get_explosion_color(normal, worldRayDirection.xyz), triangle.emissive_factor);
 		emission.rgb *= global_ubo.pt_explosion_brightness;
 	}
 
-	emission.a *= triangle.alpha;
+	emission.a *= triangle.emissive_factor;
 	emission.rgb *= emission.a;
 
 	emission.rgb *= global_ubo.prev_adapted_luminance * 500;

src/refresh/vkpt/shader/path_tracer_rgen.h

@@ -173,10 +173,9 @@ Triangle
 get_hit_triangle(RayPayloadGeometry rp)
 {
 	uint prim = get_primitive(rp);
+	uint buffer_idx = is_dynamic_instance(rp) ? VERTEX_BUFFER_INSTANCED : VERTEX_BUFFER_WORLD;
 
-	return is_dynamic_instance(rp)
-		?  get_instanced_triangle(prim)
-		:  get_bsp_triangle(prim);
+	return load_triangle(buffer_idx, prim);
 }
 
 vec3

src/refresh/vkpt/shader/primary_rays.rgen

@@ -201,26 +201,15 @@ main()
 		return;
 	}
 
-	Triangle triangle;
-	vec3 bary;
+	Triangle triangle = get_hit_triangle(ray_payload_geometry);
+	vec3 bary = get_hit_barycentric(ray_payload_geometry);
 
 	{
-		bool is_dynamic_primitive = is_dynamic_instance(ray_payload_geometry);
-		uint primitive_id = get_primitive(ray_payload_geometry);
-		bary = get_hit_barycentric(ray_payload_geometry);
-
 		uvec2 vis_buf;
-		vis_buf.x = is_dynamic_primitive
-			? get_instance_id_instanced(primitive_id)
-			: visbuf_pack_static_prim(primitive_id);
+		vis_buf.x = triangle.instance;
 		vis_buf.y = visbuf_pack_barycentrics(bary);
 
 		imageStore(IMG_PT_VISBUF_A, ipos, uvec4(vis_buf, 0, 0));
-
-		if(is_dynamic_primitive)
-			triangle = get_instanced_triangle(primitive_id);
-		else
-			triangle = get_bsp_triangle(primitive_id);
 	}
 
 	if(is_readback_pixel)

src/refresh/vkpt/shader/read_visbuf.glsl

@@ -17,13 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#define VISBUF_INSTANCE_ID_MASK     0x000003FF
-#define VISBUF_INSTANCE_PRIM_MASK   0x3FFFFC00
-#define VISBUF_INSTANCE_PRIM_SHIFT  10
-#define VISBUF_STATIC_PRIM_MASK     0x3FFFFFFF
-#define VISBUF_WORLD_INSTANCE_FLAG  0x40000000
-#define VISBUF_STATIC_PRIM_FLAG 	0x80000000
-
 uint visbuf_pack_instance(uint instance_id, uint primitive_id, bool is_world_instance)
 {
 	return (instance_id & VISBUF_INSTANCE_ID_MASK) 

src/refresh/vkpt/shader/reflect_refract.rgen

@@ -706,13 +706,8 @@ main()
 		transparent = alpha_blend_premultiplied(transparent, vec4(primary_emissive * throughput, 0));
 	}
 
-	bool is_dynamic_primitive = is_dynamic_instance(ray_payload_geometry);
-	uint primitive_id = get_primitive(ray_payload_geometry);
-
 	uvec2 vis_buf;
-	vis_buf.x = is_dynamic_primitive
-		? get_instance_id_instanced(primitive_id)
-		: visbuf_pack_static_prim(primitive_id);
+	vis_buf.x = triangle.instance;
 	vis_buf.y = visbuf_pack_barycentrics(bary);
 
 	imageStore(IMG_PT_VISBUF_A, ipos, uvec4(vis_buf, 0, 0));