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

radv: lower ycbcr textures just before applying the pipeline layout

Browse Source 
This shouldn't change anything.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15749>
This commit is contained in:
Samuel Pitoiset
2022-04-05 10:33:46 +02:00
committed by Marge Bot
parent ace073eb0b
commit 2c97e79473
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4344,6 +4344,7 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
else if (i == MESA_SHADER_TESS_EVAL && nir[MESA_SHADER_GEOMETRY])
info = &infos[MESA_SHADER_GEOMETRY];
}
NIR_PASS_V(nir[i], radv_nir_lower_ycbcr_textures, pipeline_layout);
NIR_PASS_V(nir[i], radv_nir_apply_pipeline_layout, device, pipeline_layout, info,
&args[i]);

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

@@ -844,10 +844,6 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module *
if (!key->optimisations_disabled)
radv_optimize_nir(nir, false, true);
/* call radv_nir_lower_ycbcr_textures() late as there might still be
* tex with undef texture/sampler before first optimization */
NIR_PASS_V(nir, radv_nir_lower_ycbcr_textures, layout);
/* We call nir_lower_var_copies() after the first radv_optimize_nir()
* to remove any copies introduced by nir_opt_find_array_copies().
*/