Mesa (main): radv: use inot(a) instead of ine(a, true)/ieq(a, false)

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Apr 16 00:25:10 UTC 2022


Module: Mesa
Branch: main
Commit: ce6867e6729ca24d20758f0bb830d45587870fe8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce6867e6729ca24d20758f0bb830d45587870fe8

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri Mar 25 19:55:30 2022 +0000

radv: use inot(a) instead of ine(a, true)/ieq(a, false)

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15854>

---

 src/amd/vulkan/radv_meta.c        | 4 ++--
 src/amd/vulkan/radv_pipeline_rt.c | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c
index 861fc939e08..4e4c6e62936 100644
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -780,8 +780,8 @@ radv_meta_build_resolve_shader_core(nir_builder *b, bool is_integer, int samples
       nir_ssa_dest_init(&tex_all_same->instr, &tex_all_same->dest, 1, 1, "tex");
       nir_builder_instr_insert(b, &tex_all_same->instr);
 
-      nir_ssa_def *all_same = nir_ieq(b, &tex_all_same->dest.ssa, nir_imm_bool(b, false));
-      nir_push_if(b, all_same);
+      nir_ssa_def *not_all_same = nir_inot(b, &tex_all_same->dest.ssa);
+      nir_push_if(b, not_all_same);
       for (int i = 1; i < samples; i++) {
          nir_tex_instr *tex_add = nir_tex_instr_create(b->shader, 3);
          tex_add->sampler_dim = GLSL_SAMPLER_DIM_MS;
diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index bcb54a51bf3..b550f7e6f3b 100644
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -1151,7 +1151,7 @@ insert_traversal_triangle_case(struct radv_device *device,
 
          nir_store_var(b, vars->ahit_status, nir_imm_int(b, 0), 1);
 
-         nir_push_if(b, nir_ine(b, is_opaque, nir_imm_bool(b, true)));
+         nir_push_if(b, nir_inot(b, is_opaque));
          {
             struct rt_variables inner_vars = create_inner_vars(b, vars);
 
@@ -1666,8 +1666,7 @@ create_rt_shader(struct radv_device *device, const VkRayTracingPipelineCreateInf
    nir_loop *loop = nir_push_loop(&b);
 
    nir_push_if(&b, nir_ior(&b, nir_ieq_imm(&b, nir_load_var(&b, vars.idx), 0),
-                           nir_ine(&b, nir_load_var(&b, vars.main_loop_case_visited),
-                                   nir_imm_bool(&b, true))));
+                           nir_inot(&b, nir_load_var(&b, vars.main_loop_case_visited))));
    nir_jump(&b, nir_jump_break);
    nir_pop_if(&b, NULL);
 



More information about the mesa-commit mailing list