nir: consistently use ifndef guards over pragma once

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.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>
This commit is contained in:
Emil Velikov
2017-03-20 16:04:16 +00:00
parent b08aee305e
commit e3de145fa2
10 changed files with 38 additions and 11 deletions

View File

@@ -25,7 +25,8 @@
* *
*/ */
#pragma once #ifndef NIR_H
#define NIR_H
#include "util/hash_table.h" #include "util/hash_table.h"
#include "compiler/glsl/list.h" #include "compiler/glsl/list.h"
@@ -2634,3 +2635,5 @@ gl_system_value nir_system_value_from_intrinsic(nir_intrinsic_op intrin);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* NIR_H */

View File

@@ -25,7 +25,8 @@
* *
*/ */
#pragma once #ifndef NIR_ARRAY_H
#define NIR_ARRAY_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -94,3 +95,5 @@ nir_array_grow(nir_array *arr, size_t additional)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* NIR_ARRAY_H */

View File

@@ -25,7 +25,12 @@
* *
*/ */
#ifndef NIR_CONSTANT_EXPRESSIONS_H
#define NIR_CONSTANT_EXPRESSIONS_H
#include "nir.h" #include "nir.h"
nir_const_value nir_eval_const_opcode(nir_op op, unsigned num_components, nir_const_value nir_eval_const_opcode(nir_op op, unsigned num_components,
unsigned bit_size, nir_const_value *src); unsigned bit_size, nir_const_value *src);
#endif /* NIR_CONSTANT_EXPRESSIONS_H */

View File

@@ -25,9 +25,10 @@
* *
*/ */
#include "nir.h" #ifndef NIR_CONTROL_FLOW_H
#define NIR_CONTROL_FLOW_H
#pragma once #include "nir.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -163,3 +164,5 @@ nir_cf_node_remove(nir_cf_node *node)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* NIR_CONTROL_FLOW_H */

View File

@@ -25,9 +25,11 @@
* *
*/ */
#ifndef NIR_CONTROL_FLOW_PRIVATE_H
#define NIR_CONTROL_FLOW_PRIVATE_H
#include "nir_control_flow.h" #include "nir_control_flow.h"
#pragma once
/* Internal control-flow modification functions used when inserting/removing /* Internal control-flow modification functions used when inserting/removing
* instructions. * instructions.
@@ -35,3 +37,5 @@
void nir_handle_add_jump(nir_block *block); void nir_handle_add_jump(nir_block *block);
void nir_handle_remove_jump(nir_block *block, nir_jump_type type); void nir_handle_remove_jump(nir_block *block, nir_jump_type type);
#endif /* NIR_CONTROL_FLOW_PRIVATE_H */

View File

@@ -21,7 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#pragma once #ifndef NIR_INSTR_SET_H
#define NIR_INSTR_SET_H
#include "nir.h" #include "nir.h"
@@ -60,3 +61,4 @@ void nir_instr_set_remove(struct set *instr_set, nir_instr *instr);
/*@}*/ /*@}*/
#endif /* NIR_INSTR_SET_H */

View File

@@ -21,7 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#pragma once #ifndef NIR_LOOP_ANALYZE_H
#define NIR_LOOP_ANALYZE_H
#include "nir.h" #include "nir.h"
@@ -90,3 +91,5 @@ nir_is_trivial_loop_if(nir_if *nif, nir_block *break_block)
return true; return true;
} }
#endif /* NIR_LOOP_ANALYZE_H */

View File

@@ -21,7 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#pragma once #ifndef NIR_PHI_BUILDER_H
#define NIR_PHI_BUILDER_H
#include "nir.h" #include "nir.h"
@@ -114,3 +115,5 @@ nir_phi_builder_value_get_block_def(struct nir_phi_builder_value *val,
* adds the phi nodes to the program. * adds the phi nodes to the program.
*/ */
void nir_phi_builder_finish(struct nir_phi_builder *pb); void nir_phi_builder_finish(struct nir_phi_builder *pb);
#endif /* NIR_PHI_BUILDER_H */

View File

@@ -25,8 +25,8 @@
* *
**************************************************************************/ **************************************************************************/
#pragma once #ifndef NIR_VLA_H
#define NIR_VLA_H
#include "c99_alloca.h" #include "c99_alloca.h"
@@ -52,3 +52,5 @@
*/ */
#define NIR_VLA_ZERO(_type, _name, _length) \ #define NIR_VLA_ZERO(_type, _name, _length) \
NIR_VLA_FILL(_type, _name, _length, 0) NIR_VLA_FILL(_type, _name, _length, 0)
#endif /* NIR_VLA_H */

View File

@@ -25,7 +25,6 @@
* *
*/ */
#pragma once
#ifndef _NIR_WORKLIST_ #ifndef _NIR_WORKLIST_
#define _NIR_WORKLIST_ #define _NIR_WORKLIST_