fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 23:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Replace nir_vector_extract with nir_channel

Browse source 
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16650>
This commit is contained in:
Konstantin Seurer 2022-05-21 23:53:31 +02:00 • committed by Marge Bot
parent 182f1d44a0
commit d5023027a4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/amd/vulkan/radv_nir_lower_ray_queries.c
View file

@ -507,8 +507,8 @@ insert_traversal_triangle_case(struct radv_device *device, nir_builder *b, nir_s
nir_ssa_def *result, struct ray_query_vars *vars,
nir_ssa_def *bvh_node)
{
nir_ssa_def *dist = nir_vector_extract(b, result, nir_imm_int(b, 0));
nir_ssa_def *div = nir_vector_extract(b, result, nir_imm_int(b, 1));
nir_ssa_def *dist = nir_channel(b, result, 0);
nir_ssa_def *div = nir_channel(b, result, 1);
dist = nir_fdiv(b, dist, div);
nir_ssa_def *frontface = nir_flt(b, nir_imm_float(b, 0), div);
nir_ssa_def *switch_ccw =
@ -795,7 +795,7 @@ lower_rq_proceed(nir_builder *b, nir_ssa_def *index, struct ray_query_vars *vars
/* box */
for (unsigned i = 4; i-- > 0;) {
nir_ssa_def *new_node = nir_vector_extract(b, result, nir_imm_int(b, i));
nir_ssa_def *new_node = nir_channel(b, result, i);
nir_push_if(b, nir_ine_imm(b, new_node, 0xffffffff));
{
rq_store_array(b, index, vars->stack, rq_load_var(b, index, vars->trav.stack),

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

@ -1113,8 +1113,8 @@ insert_traversal_triangle_case(struct radv_device *device,
nir_ssa_def *result, const struct rt_variables *vars,
const struct rt_traversal_vars *trav_vars, nir_ssa_def *bvh_node)
{
nir_ssa_def *dist = nir_vector_extract(b, result, nir_imm_int(b, 0));
nir_ssa_def *div = nir_vector_extract(b, result, nir_imm_int(b, 1));
nir_ssa_def *dist = nir_channel(b, result, 0);
nir_ssa_def *div = nir_channel(b, result, 1);
dist = nir_fdiv(b, dist, div);
nir_ssa_def *frontface = nir_flt(b, nir_imm_float(b, 0), div);
nir_ssa_def *switch_ccw =
@ -1552,7 +1552,7 @@ insert_traversal(struct radv_device *device, const VkRayTracingPipelineCreateInf
}
for (unsigned i = 4; i-- > 0; ) {
nir_ssa_def *new_node = nir_vector_extract(b, result, nir_imm_int(b, i));
nir_ssa_def *new_node = nir_channel(b, result, i);
nir_push_if(b, nir_ine_imm(b, new_node, 0xffffffff));
{
nir_store_shared(b, new_node, nir_load_var(b, trav_vars.stack), .base = 0,