From 2438c0a236639e510716228ffd9578329185fe00 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 20 Mar 2017 16:04:38 +0000
Subject: [PATCH] intel/compiler: consistently use ifndef guards over pragma
 once
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Vedran Miletić <vedran@miletic.net>
Acked-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
---
 src/intel/compiler/brw_cfg.h                 | 1 -
 src/intel/compiler/brw_compiler.h            | 5 ++++-
 src/intel/compiler/brw_dead_control_flow.h   | 5 +++++
 src/intel/compiler/brw_fs.h                  | 5 ++++-
 src/intel/compiler/brw_fs_live_variables.h   | 5 +++++
 src/intel/compiler/brw_nir.h                 | 5 ++++-
 src/intel/compiler/brw_shader.h              | 5 ++++-
 src/intel/compiler/brw_vec4_live_variables.h | 5 +++++
 8 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/intel/compiler/brw_cfg.h b/src/intel/compiler/brw_cfg.h
index b8af40f725f..0c5d1268f1a 100644
--- a/src/intel/compiler/brw_cfg.h
+++ b/src/intel/compiler/brw_cfg.h
@@ -25,7 +25,6 @@
  *
  */
 
-#pragma once
 #ifndef BRW_CFG_H
 #define BRW_CFG_H
 
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 85257d494af..d4128bccbc1 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef BRW_COMPILER_H
+#define BRW_COMPILER_H
 
 #include <stdio.h>
 #include "common/gen_device_info.h"
@@ -1055,3 +1056,5 @@ brw_stage_has_packed_dispatch(const struct gen_device_info *devinfo,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
+
+#endif /* BRW_COMPILER_H */
diff --git a/src/intel/compiler/brw_dead_control_flow.h b/src/intel/compiler/brw_dead_control_flow.h
index 83fd9b1e79e..9732c2b9f3f 100644
--- a/src/intel/compiler/brw_dead_control_flow.h
+++ b/src/intel/compiler/brw_dead_control_flow.h
@@ -21,6 +21,11 @@
  * IN THE SOFTWARE.
  */
 
+#ifndef BRW_DEAD_CONTROL_FLOW_H
+#define BRW_DEAD_CONTROL_FLOW_H
+
 #include "brw_shader.h"
 
 bool dead_control_flow_eliminate(backend_shader *s);
+
+#endif /* BRW_DEAD_CONTROL_FLOW_H */
diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h
index 00861ce5dad..8a5525b786e 100644
--- a/src/intel/compiler/brw_fs.h
+++ b/src/intel/compiler/brw_fs.h
@@ -25,7 +25,8 @@
  *
  */
 
-#pragma once
+#ifndef BRW_FS_H
+#define BRW_FS_H
 
 #include "brw_shader.h"
 #include "brw_ir_fs.h"
@@ -498,3 +499,5 @@ fs_reg setup_imm_df(const brw::fs_builder &bld,
 
 enum brw_barycentric_mode brw_barycentric_mode(enum glsl_interp_mode mode,
                                                nir_intrinsic_op op);
+
+#endif /* BRW_FS_H */
diff --git a/src/intel/compiler/brw_fs_live_variables.h b/src/intel/compiler/brw_fs_live_variables.h
index 91d1e42cbc1..d2d5898ed1c 100644
--- a/src/intel/compiler/brw_fs_live_variables.h
+++ b/src/intel/compiler/brw_fs_live_variables.h
@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef BRW_FS_LIVE_VARIABLES_H
+#define BRW_FS_LIVE_VARIABLES_H
+
 #include "brw_fs.h"
 #include "util/bitset.h"
 
@@ -113,3 +116,5 @@ protected:
 };
 
 } /* namespace brw */
+
+#endif /* BRW_FS_LIVE_VARIABLES_H */
diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw_nir.h
index 76d7ec89f9b..b96072cf962 100644
--- a/src/intel/compiler/brw_nir.h
+++ b/src/intel/compiler/brw_nir.h
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef BRW_NIR_H
+#define BRW_NIR_H
 
 #include "brw_reg.h"
 #include "compiler/nir/nir.h"
@@ -152,3 +153,5 @@ bool brw_nir_opt_peephole_ffma(nir_shader *shader);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* BRW_NIR_H */
diff --git a/src/intel/compiler/brw_shader.h b/src/intel/compiler/brw_shader.h
index 89e2776776e..30e7bf75c58 100644
--- a/src/intel/compiler/brw_shader.h
+++ b/src/intel/compiler/brw_shader.h
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef BRW_SHADER_H
+#define BRW_SHADER_H
 
 #include <stdint.h>
 #include "brw_reg.h"
@@ -288,3 +289,5 @@ unsigned get_atomic_counter_op(nir_intrinsic_op op);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* BRW_SHADER_H */
diff --git a/src/intel/compiler/brw_vec4_live_variables.h b/src/intel/compiler/brw_vec4_live_variables.h
index 8807c453743..2946b98aacc 100644
--- a/src/intel/compiler/brw_vec4_live_variables.h
+++ b/src/intel/compiler/brw_vec4_live_variables.h
@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef BRW_VEC4_LIVE_VARIABLES_H
+#define BRW_VEC4_LIVE_VARIABLES_H
+
 #include "util/bitset.h"
 #include "brw_vec4.h"
 
@@ -110,3 +113,5 @@ var_from_reg(const simple_allocator &alloc, const dst_reg &reg,
 }
 
 } /* namespace brw */
+
+#endif /* BRW_VEC4_LIVE_VARIABLES_H */
-- 
2.30.2