Mesa (master): nir/glsl: Fix copy-n-paste mistakes from commit 213f864.

Matt Turner mattst88 at kemper.freedesktop.org
Mon Nov 16 17:05:33 UTC 2015


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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sat Nov 14 17:47:33 2015 -0800

nir/glsl: Fix copy-n-paste mistakes from commit 213f864.

Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>

---

 src/glsl/nir/glsl_to_nir.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp
index 38b8390..6d24341 100644
--- a/src/glsl/nir/glsl_to_nir.cpp
+++ b/src/glsl/nir/glsl_to_nir.cpp
@@ -1533,9 +1533,9 @@ nir_visitor::visit(ir_expression *ir)
       result = supports_ints ? nir_ior(&b, srcs[0], srcs[1])
                              : nir_for(&b, srcs[0], srcs[1]);
       break;
-   case ir_binop_logic_xor: result = nir_ixor(&b, srcs[0], srcs[1]); break;
-      result = supports_ints ? nir_ior(&b, srcs[0], srcs[1])
-                             : nir_for(&b, srcs[0], srcs[1]);
+   case ir_binop_logic_xor:
+      result = supports_ints ? nir_ixor(&b, srcs[0], srcs[1])
+                             : nir_fxor(&b, srcs[0], srcs[1]);
       break;
    case ir_binop_lshift: result = nir_ishl(&b, srcs[0], srcs[1]); break;
    case ir_binop_rshift:




More information about the mesa-commit mailing list