From d5023027a47de23353fc186e936ee407a07a3cfa Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Sat, 21 May 2022 23:53:31 +0200 Subject: [PATCH] radv: Replace nir_vector_extract with nir_channel Signed-off-by: Konstantin Seurer Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_nir_lower_ray_queries.c | 6 +++--- src/amd/vulkan/radv_pipeline_rt.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_nir_lower_ray_queries.c b/src/amd/vulkan/radv_nir_lower_ray_queries.c index b5567de0bc0..084c6a83d55 100644 --- a/src/amd/vulkan/radv_nir_lower_ray_queries.c +++ b/src/amd/vulkan/radv_nir_lower_ray_queries.c @@ -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), diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index 11b9f7f1766..2f66ae55148 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -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,