Mesa (staging/20.1): intel/fs: Use the correct logical op for global float atomics

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 9bf98292777ebf24e10e01e931f8a78cf434f697
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bf98292777ebf24e10e01e931f8a78cf434f697

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Jul 14 14:40:35 2020 -0500

intel/fs: Use the correct logical op for global float atomics

Fixes: e644ed468f98 "intel/fs: Implement nir_intrinsic_global_atomic_*"
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5992>
(cherry picked from commit 675d7b19a9aece0ea674eadba20ec2b01c86de6e)

---

 .pick_status.json                 | 2 +-
 src/intel/compiler/brw_fs_nir.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a990da46faa..ca7f35a0c0e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -67,7 +67,7 @@
         "description": "intel/fs: Use the correct logical op for global float atomics",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e644ed468f986b44310b1cc5d5695ed4d473223d"
     },
diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index 5182c07f462..c75ee6e23a8 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -5503,7 +5503,7 @@ fs_visitor::nir_emit_global_atomic_float(const fs_builder &bld,
       data = tmp;
    }
 
-   bld.emit(SHADER_OPCODE_A64_UNTYPED_ATOMIC_LOGICAL,
+   bld.emit(SHADER_OPCODE_A64_UNTYPED_ATOMIC_FLOAT_LOGICAL,
             dest, addr, data, brw_imm_ud(op));
 }