fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Add a shader variant for PLOC with extended SAH

Browse source 
Reviewed-by: Friedrich Vock <friedrich.vock@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20656>
This commit is contained in:
Konstantin Seurer 2023-01-11 21:36:31 +01:00 • committed by Marge Bot
parent b1755c0b21
commit c53eb2f3d4
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/amd/vulkan/bvh/meson.build
View file

@ -50,6 +50,11 @@ bvh_shaders = [
'ploc_internal', 'ploc_internal',
['EXTENDED_SAH=0'], ['EXTENDED_SAH=0'],
], ],
[
'ploc_internal.comp',
'ploc_internal_extended',
['EXTENDED_SAH=1'],
],
[ [
'converter_internal.comp', 'converter_internal.comp',
'converter_internal', 'converter_internal',

13
src/amd/vulkan/radv_acceleration_structure.c
View file

@ -53,6 +53,10 @@ static const uint32_t ploc_spv[] = {
#include "bvh/ploc_internal.spv.h" #include "bvh/ploc_internal.spv.h"
}; };
static const uint32_t ploc_extended_spv[] = {
#include "bvh/ploc_internal_extended.spv.h"
};
static const uint32_t copy_spv[] = { static const uint32_t copy_spv[] = {
#include "bvh/copy.spv.h" #include "bvh/copy.spv.h"
}; };
@ -331,6 +335,8 @@ radv_device_finish_accel_struct_build_state(struct radv_device *device)
&state->alloc); &state->alloc);
radv_DestroyPipeline(radv_device_to_handle(device), state->accel_struct_build.ploc_pipeline, radv_DestroyPipeline(radv_device_to_handle(device), state->accel_struct_build.ploc_pipeline,
&state->alloc); &state->alloc);
radv_DestroyPipeline(radv_device_to_handle(device),
state->accel_struct_build.ploc_extended_pipeline, &state->alloc);
radv_DestroyPipeline(radv_device_to_handle(device), radv_DestroyPipeline(radv_device_to_handle(device),
state->accel_struct_build.lbvh_generate_ir_pipeline, &state->alloc); state->accel_struct_build.lbvh_generate_ir_pipeline, &state->alloc);
radv_DestroyPipeline(radv_device_to_handle(device), state->accel_struct_build.lbvh_main_pipeline, radv_DestroyPipeline(radv_device_to_handle(device), state->accel_struct_build.lbvh_main_pipeline,
@ -592,6 +598,13 @@ radv_device_init_accel_struct_build_state(struct radv_device *device)
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
result = create_build_pipeline_spv(device, ploc_extended_spv, sizeof(ploc_extended_spv),
sizeof(struct ploc_args),
&device->meta_state.accel_struct_build.ploc_extended_pipeline,
&device->meta_state.accel_struct_build.ploc_p_layout);
if (result != VK_SUCCESS)
return result;
result = create_build_pipeline_spv(device, convert_leaf_spv, sizeof(convert_leaf_spv), result = create_build_pipeline_spv(device, convert_leaf_spv, sizeof(convert_leaf_spv),
sizeof(struct convert_leaf_args), sizeof(struct convert_leaf_args),
&device->meta_state.accel_struct_build.convert_leaf_pipeline, &device->meta_state.accel_struct_build.convert_leaf_pipeline,

1
src/amd/vulkan/radv_private.h
View file

@ -688,6 +688,7 @@ struct radv_meta_state {
VkPipeline lbvh_generate_ir_pipeline; VkPipeline lbvh_generate_ir_pipeline;
VkPipelineLayout ploc_p_layout; VkPipelineLayout ploc_p_layout;
VkPipeline ploc_pipeline; VkPipeline ploc_pipeline;
VkPipeline ploc_extended_pipeline;
VkPipelineLayout convert_leaf_p_layout; VkPipelineLayout convert_leaf_p_layout;
VkPipeline convert_leaf_pipeline; VkPipeline convert_leaf_pipeline;
VkPipelineLayout convert_internal_p_layout; VkPipelineLayout convert_internal_p_layout;