[Mesa-dev] [PATCH v2 6/7] nir: make nir_instrs_equal() static

Connor Abbott cwabbott0 at gmail.com
Wed Sep 30 08:12:01 PDT 2015


This was previously tied to CSE, since it would only work for
instructions where nir_can_cse() (now instr_can_rewrite()) returned
true. Now that CSE uses the instruction set abstraction which only uses
this internally, we can make it local to nir_instr_set.c.

Signed-off-by: Connor Abbott <cwabbott0 at gmail.com>
---
 src/glsl/nir/nir_instr_set.c | 2 +-
 src/glsl/nir/nir_instr_set.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/glsl/nir/nir_instr_set.c b/src/glsl/nir/nir_instr_set.c
index a6f2226..007d6cb 100644
--- a/src/glsl/nir/nir_instr_set.c
+++ b/src/glsl/nir/nir_instr_set.c
@@ -244,7 +244,7 @@ nir_alu_srcs_equal(const nir_alu_instr *alu1, const nir_alu_instr *alu2,
  * the same hash for (ignoring collisions, of course).
  */
 
-bool
+static bool
 nir_instrs_equal(const nir_instr *instr1, const nir_instr *instr2)
 {
    if (instr1->type != instr2->type)
diff --git a/src/glsl/nir/nir_instr_set.h b/src/glsl/nir/nir_instr_set.h
index a7f6c9d..939e8dd 100644
--- a/src/glsl/nir/nir_instr_set.h
+++ b/src/glsl/nir/nir_instr_set.h
@@ -25,8 +25,6 @@
 
 #include "nir.h"
 
-bool nir_instrs_equal(const nir_instr *instr1, const nir_instr *instr2);
-
 /**
  * This file defines functions for creating, destroying, and manipulating an
  * "instruction set," which is an abstraction for finding duplicate
-- 
2.1.0



More information about the mesa-dev mailing list