OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: regroup PS epilog info when generating the graphics pipeline key

Browse Source 
No logical change.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21140>
This commit is contained in:
Samuel Pitoiset
2023-02-06 16:25:15 +01:00
committed by Marge Bot
parent 84d006ef11
commit ea5c893289
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/vulkan/radv_pipeline.c
View File

@@ -2373,8 +2373,6 @@ radv_generate_graphics_pipeline_key(const struct radv_graphics_pipeline *pipelin
} }
} }
key.ps.epilog = radv_pipeline_generate_ps_epilog_key(pipeline, state, pipeline->ps_epilog);
if (device->physical_device->rad_info.gfx_level >= GFX11 && state->ms) { if (device->physical_device->rad_info.gfx_level >= GFX11 && state->ms) {
key.ps.alpha_to_coverage_via_mrtz = state->ms->alpha_to_coverage_enable; key.ps.alpha_to_coverage_via_mrtz = state->ms->alpha_to_coverage_enable;
} }
@@ -2423,6 +2421,8 @@ radv_generate_graphics_pipeline_key(const struct radv_graphics_pipeline *pipelin
!(lib_flags & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT)) || !(lib_flags & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT)) ||
key.ps.dynamic_ps_epilog); key.ps.dynamic_ps_epilog);
key.ps.epilog = radv_pipeline_generate_ps_epilog_key(pipeline, state, pipeline->ps_epilog);
key.dynamic_patch_control_points = key.dynamic_patch_control_points =
!!(pipeline->dynamic_states & RADV_DYNAMIC_PATCH_CONTROL_POINTS); !!(pipeline->dynamic_states & RADV_DYNAMIC_PATCH_CONTROL_POINTS);