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

radv: remove useless shader variant key copies for VS+TCS

Browse Source 
It's unnecessary.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12976>
This commit is contained in:
Samuel Pitoiset
2021-09-22 15:40:14 +02:00
committed by Marge Bot
parent 978a5ec5d2
commit cd64535aff
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2959,13 +2959,13 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
if (pipeline->device->physical_device->rad_info.chip_class >= GFX9 && if (pipeline->device->physical_device->rad_info.chip_class >= GFX9 &&
nir[MESA_SHADER_TESS_CTRL]) { nir[MESA_SHADER_TESS_CTRL]) {
struct nir_shader *combined_nir[] = {nir[MESA_SHADER_VERTEX], nir[MESA_SHADER_TESS_CTRL]}; struct nir_shader *combined_nir[] = {nir[MESA_SHADER_VERTEX], nir[MESA_SHADER_TESS_CTRL]};
struct radv_shader_variant_key key = keys[MESA_SHADER_TESS_CTRL]; struct radv_shader_variant_key *key = &keys[MESA_SHADER_TESS_CTRL];
key.tcs.vs_key = keys[MESA_SHADER_VERTEX].vs; key->tcs.vs_key = keys[MESA_SHADER_VERTEX].vs;
radv_nir_shader_info_init(&infos[MESA_SHADER_TESS_CTRL]); radv_nir_shader_info_init(&infos[MESA_SHADER_TESS_CTRL]);
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
radv_nir_shader_info_pass(pipeline->device, combined_nir[i], pipeline->layout, &key, radv_nir_shader_info_pass(pipeline->device, combined_nir[i], pipeline->layout, key,
&infos[MESA_SHADER_TESS_CTRL]); &infos[MESA_SHADER_TESS_CTRL]);
} }
@@ -3661,13 +3661,13 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_device *device,
if (device->physical_device->rad_info.chip_class >= GFX9 && modules[MESA_SHADER_TESS_CTRL]) { if (device->physical_device->rad_info.chip_class >= GFX9 && modules[MESA_SHADER_TESS_CTRL]) {
if (!pipeline->shaders[MESA_SHADER_TESS_CTRL]) { if (!pipeline->shaders[MESA_SHADER_TESS_CTRL]) {
struct nir_shader *combined_nir[] = {nir[MESA_SHADER_VERTEX], nir[MESA_SHADER_TESS_CTRL]}; struct nir_shader *combined_nir[] = {nir[MESA_SHADER_VERTEX], nir[MESA_SHADER_TESS_CTRL]};
struct radv_shader_variant_key key = keys[MESA_SHADER_TESS_CTRL]; struct radv_shader_variant_key *key = &keys[MESA_SHADER_TESS_CTRL];
key.tcs.vs_key = keys[MESA_SHADER_VERTEX].vs; key->tcs.vs_key = keys[MESA_SHADER_VERTEX].vs;
radv_start_feedback(stage_feedbacks[MESA_SHADER_TESS_CTRL]); radv_start_feedback(stage_feedbacks[MESA_SHADER_TESS_CTRL]);
pipeline->shaders[MESA_SHADER_TESS_CTRL] = radv_shader_variant_compile( pipeline->shaders[MESA_SHADER_TESS_CTRL] = radv_shader_variant_compile(
device, modules[MESA_SHADER_TESS_CTRL], combined_nir, 2, pipeline->layout, &key, device, modules[MESA_SHADER_TESS_CTRL], combined_nir, 2, pipeline->layout, key,
&infos[MESA_SHADER_TESS_CTRL], keep_executable_info, keep_statistic_info, &infos[MESA_SHADER_TESS_CTRL], keep_executable_info, keep_statistic_info,
disable_optimizations, &binaries[MESA_SHADER_TESS_CTRL]); disable_optimizations, &binaries[MESA_SHADER_TESS_CTRL]);