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

radv: move lowering of FS outputs outside of ACO

Browse Source 
This enables lowering of FS outputs for RADV/LLVM.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Acked-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6865>
This commit is contained in:
Samuel Pitoiset
2020-09-25 16:11:27 +02:00
committed by Marge Bot
parent 4dae9e53f6
commit 291cfb1e41
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/amd/compiler/aco_instruction_selection_setup.cpp
View File

@@ -646,7 +646,8 @@ setup_nir(isel_context *ctx, nir_shader *nir)
lower_to_scalar = true;
lower_pack = true;
}
if (nir->info.stage != MESA_SHADER_COMPUTE)
if (nir->info.stage != MESA_SHADER_COMPUTE &&
nir->info.stage != MESA_SHADER_FRAGMENT)
nir_lower_io(nir, nir_var_shader_in | nir_var_shader_out, type_size, (nir_lower_io_options)0);
lower_to_scalar |= nir_opt_shrink_vectors(nir);

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

@@ -758,7 +758,7 @@ radv_lower_fs_io(nir_shader *nir)
nir_assign_io_var_locations(nir, nir_var_shader_in, &nir->num_inputs,
MESA_SHADER_FRAGMENT);
NIR_PASS_V(nir, nir_lower_io, nir_var_shader_in, type_size_vec4, 0);
NIR_PASS_V(nir, nir_lower_io, nir_var_shader_in | nir_var_shader_out, type_size_vec4, 0);
/* This pass needs actual constants */
nir_opt_constant_folding(nir);