nir: constify instruction comparison functions

v2: rebase, don't constify nir_srcs_equal() as it's pass-by-value
anyways

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Connor Abbott <cwabbott0@gmail.com>

diff --git a/src/glsl/nir/nir_instr_set.c b/src/glsl/nir/nir_instr_set.c
index b397442fbe596d274283c31f576a2b5c856f0eeb..72ab04895f6c1c67dd357dd99bc11f5d4183dc4a 100644 (file)
--- a/src/glsl/nir/nir_instr_set.c
+++ b/src/glsl/nir/nir_instr_set.c
@@ -51,8 +51,8 @@ nir_srcs_equal(nir_src src1, nir_src src2)
 }
 
 static bool
-nir_alu_srcs_equal(nir_alu_instr *alu1, nir_alu_instr *alu2, unsigned src1,
-                   unsigned src2)
+nir_alu_srcs_equal(const nir_alu_instr *alu1, const nir_alu_instr *alu2,
+                   unsigned src1, unsigned src2)
 {
    if (alu1->src[src1].abs != alu2->src[src2].abs ||
        alu1->src[src1].negate != alu2->src[src2].negate)
@@ -67,7 +67,7 @@ nir_alu_srcs_equal(nir_alu_instr *alu1, nir_alu_instr *alu2, unsigned src1,
 }
 
 bool
-nir_instrs_equal(nir_instr *instr1, nir_instr *instr2)
+nir_instrs_equal(const nir_instr *instr1, const nir_instr *instr2)
 {
    if (instr1->type != instr2->type)
       return false;

diff --git a/src/glsl/nir/nir_instr_set.h b/src/glsl/nir/nir_instr_set.h
index 531bdade319c22fcf89ed3d4b6b6ab022f106e16..f5baffacb0eb6ff4d15539481dff0a99b7a4c028 100644 (file)
--- a/src/glsl/nir/nir_instr_set.h
+++ b/src/glsl/nir/nir_instr_set.h
@@ -25,5 +25,5 @@
 
 #include "nir.h"
 
-bool nir_instrs_equal(nir_instr *instr1, nir_instr *instr2);
+bool nir_instrs_equal(const nir_instr *instr1, const nir_instr *instr2);