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

radv/rt: Don't combine config of unreachable shaders
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
These can pessimize register estimation for no good reason.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40455>
This commit is contained in:
Natalie Vock 2026-03-17 11:54:10 +01:00 • committed by Marge Bot
parent c1a7680d93
commit 5b76c1dd0c
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/amd/vulkan/radv_pipeline_rt.c
View file

@ -1050,11 +1050,23 @@ compile_rt_prolog(struct radv_device *device, struct radv_ray_tracing_pipeline *
radv_nir_lower_callee_signature(&raygen_stub);
pipeline->prolog = radv_create_rt_prolog(device, raygen_stub.num_params, raygen_stub.params);
bool has_traversal = !!pipeline->base.base.shaders[MESA_SHADER_INTERSECTION];
/* create combined config */
struct ac_shader_config *config = &pipeline->prolog->config;
for (unsigned i = 0; i < pipeline->stage_count; i++) {
const struct radv_shader *shader = pipeline->stages[i].shader;
/* !has_traversal means the pipeline is completely monolithic and will never call any
* shaders (except for the raygen shader, which contains the entire RT pipeline).
* Ignore all shaders except for the raygen shader - they may appear in the stages array due to pipeline library
* imports, but they will never be called.
*/
if (!has_traversal) {
if (pipeline->stages[i].stage != MESA_SHADER_RAYGEN)
continue;
}
if (!shader)
continue;
@ -1066,7 +1078,7 @@ compile_rt_prolog(struct radv_device *device, struct radv_ray_tracing_pipeline *
for (unsigned i = 0; i < pipeline->group_count; i++) {
const struct radv_shader *shader = pipeline->groups[i].ahit_isec_shader;
if (!shader)
if (!shader || !has_traversal)
continue;
combine_config(config, &shader->config);
@ -1074,7 +1086,7 @@ compile_rt_prolog(struct radv_device *device, struct radv_ray_tracing_pipeline *
push_constant_size = MAX2(push_constant_size, shader->info.push_constant_size);
}
if (pipeline->base.base.shaders[MESA_SHADER_INTERSECTION]) {
if (has_traversal) {
const struct radv_shader *traversal_shader = pipeline->base.base.shaders[MESA_SHADER_INTERSECTION];
combine_config(config, &traversal_shader->config);