diff options
| -rw-r--r-- | ast_function.cpp | 1 | ||||
| -rw-r--r-- | ast_to_hir.cpp | 2 | ||||
| -rw-r--r-- | hir_field_selection.cpp | 4 | ||||
| -rw-r--r-- | ir.h | 3 | ||||
| -rw-r--r-- | ir_basic_block.cpp | 1 | ||||
| -rw-r--r-- | ir_constant_expression.cpp | 1 | ||||
| -rw-r--r-- | ir_constant_folding.cpp | 1 | ||||
| -rw-r--r-- | ir_constant_variable.cpp | 2 | ||||
| -rw-r--r-- | ir_copy_propagation.cpp | 1 | ||||
| -rw-r--r-- | ir_dead_code.cpp | 1 | ||||
| -rw-r--r-- | ir_dead_code_local.cpp | 1 | ||||
| -rw-r--r-- | ir_expression_flattening.cpp | 1 | ||||
| -rw-r--r-- | ir_function_can_inline.cpp | 1 | ||||
| -rw-r--r-- | ir_function_inlining.cpp | 1 | ||||
| -rw-r--r-- | ir_hierarchical_visitor.cpp | 2 | ||||
| -rw-r--r-- | ir_hv_accept.cpp | 2 | ||||
| -rw-r--r-- | ir_if_simplification.cpp | 1 | ||||
| -rw-r--r-- | ir_print_visitor.cpp | 2 | ||||
| -rw-r--r-- | ir_reader.cpp | 2 | ||||
| -rw-r--r-- | ir_swizzle_swizzle.cpp | 1 | ||||
| -rw-r--r-- | ir_variable.cpp | 3 | ||||
| -rw-r--r-- | ir_vec_index_to_swizzle.cpp | 1 |
22 files changed, 11 insertions, 24 deletions
diff --git a/ast_function.cpp b/ast_function.cpp index 279c45eac0..26050977d5 100644 --- a/ast_function.cpp +++ b/ast_function.cpp @@ -21,7 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -#include <cstdio> #include "glsl_symbol_table.h" #include "ast.h" #include "glsl_types.h" diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index dbc3666069..aa90d4b663 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -48,7 +48,7 @@ * As a result, my preference is to put as little C code as possible in the * parser (and lexer) sources. */ -#include <stdio.h> + #include "main/imports.h" #include "glsl_symbol_table.h" #include "glsl_parser_extras.h" diff --git a/hir_field_selection.cpp b/hir_field_selection.cpp index f0be84dab4..e60ea30d7f 100644 --- a/hir_field_selection.cpp +++ b/hir_field_selection.cpp @@ -20,13 +20,13 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> + +#include "ir.h" #include "main/imports.h" #include "symbol_table.h" #include "glsl_parser_extras.h" #include "ast.h" #include "glsl_types.h" -#include "ir.h" struct ir_rvalue * _mesa_ast_field_selection_to_hir(const ast_expression *expr, @@ -26,6 +26,9 @@ #ifndef IR_H #define IR_H +#include <cstdio> +#include <cstdlib> + #include "list.h" #include "ir_visitor.h" #include "ir_hierarchical_visitor.h" diff --git a/ir_basic_block.cpp b/ir_basic_block.cpp index 2cf3704605..f9953ea42d 100644 --- a/ir_basic_block.cpp +++ b/ir_basic_block.cpp @@ -27,7 +27,6 @@ * Basic block analysis of instruction streams. */ -#include <stdio.h> #include "ir.h" #include "ir_visitor.h" #include "ir_basic_block.h" diff --git a/ir_constant_expression.cpp b/ir_constant_expression.cpp index 5bb592079a..e9f0499820 100644 --- a/ir_constant_expression.cpp +++ b/ir_constant_expression.cpp @@ -33,7 +33,6 @@ * * Initializers for \c const variables */ -#define NULL 0 #include <math.h> #include "ir.h" #include "ir_visitor.h" diff --git a/ir_constant_folding.cpp b/ir_constant_folding.cpp index 5dc4a7dc65..342d027bbe 100644 --- a/ir_constant_folding.cpp +++ b/ir_constant_folding.cpp @@ -26,7 +26,6 @@ * Replace constant-valued expressions with references to constant values. */ -#define NULL 0 #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" diff --git a/ir_constant_variable.cpp b/ir_constant_variable.cpp index 7210c17dc7..a905474d85 100644 --- a/ir_constant_variable.cpp +++ b/ir_constant_variable.cpp @@ -32,8 +32,6 @@ * and calls to builtin functions. */ -#include <stdio.h> -#include <stdlib.h> #include "ir.h" #include "ir_print_visitor.h" #include "ir_visitor.h" diff --git a/ir_copy_propagation.cpp b/ir_copy_propagation.cpp index 1c5c10d6fc..da5998109f 100644 --- a/ir_copy_propagation.cpp +++ b/ir_copy_propagation.cpp @@ -32,7 +32,6 @@ * help anyway by triggering other optimizations that live in the HIR. */ -#include <stdio.h> #include "ir.h" #include "ir_visitor.h" #include "ir_print_visitor.h" diff --git a/ir_dead_code.cpp b/ir_dead_code.cpp index 2ede7ff0cf..8465d863aa 100644 --- a/ir_dead_code.cpp +++ b/ir_dead_code.cpp @@ -27,7 +27,6 @@ * Eliminates dead assignments and variable declarations from the code. */ -#define NULL 0 #include "ir.h" #include "ir_visitor.h" #include "ir_expression_flattening.h" diff --git a/ir_dead_code_local.cpp b/ir_dead_code_local.cpp index e83b300390..344a6ebfbf 100644 --- a/ir_dead_code_local.cpp +++ b/ir_dead_code_local.cpp @@ -33,7 +33,6 @@ * for assignments to variables that are never read. */ -#include <stdio.h> #include "ir.h" #include "ir_print_visitor.h" #include "ir_basic_block.h" diff --git a/ir_expression_flattening.cpp b/ir_expression_flattening.cpp index 394a0d0432..3089f17ae1 100644 --- a/ir_expression_flattening.cpp +++ b/ir_expression_flattening.cpp @@ -33,7 +33,6 @@ * instruction stream. */ -#define NULL 0 #include "ir.h" #include "ir_visitor.h" #include "ir_expression_flattening.h" diff --git a/ir_function_can_inline.cpp b/ir_function_can_inline.cpp index 3be351055d..5761a74204 100644 --- a/ir_function_can_inline.cpp +++ b/ir_function_can_inline.cpp @@ -33,7 +33,6 @@ * (0) loop surrounding the function body. */ -#define NULL 0 #include "ir.h" class ir_function_can_inline_visitor : public ir_hierarchical_visitor { diff --git a/ir_function_inlining.cpp b/ir_function_inlining.cpp index a501c813fb..4e5604f89f 100644 --- a/ir_function_inlining.cpp +++ b/ir_function_inlining.cpp @@ -27,7 +27,6 @@ * Replaces calls to functions with the body of the function. */ -#define NULL 0 #include "ir.h" #include "ir_visitor.h" #include "ir_function_inlining.h" diff --git a/ir_hierarchical_visitor.cpp b/ir_hierarchical_visitor.cpp index fd77391973..11d30b4b6e 100644 --- a/ir_hierarchical_visitor.cpp +++ b/ir_hierarchical_visitor.cpp @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#define NULL 0 + #include "ir.h" #include "ir_hierarchical_visitor.h" diff --git a/ir_hv_accept.cpp b/ir_hv_accept.cpp index 7c1798a051..5432633272 100644 --- a/ir_hv_accept.cpp +++ b/ir_hv_accept.cpp @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#define NULL 0 + #include "ir.h" /** diff --git a/ir_if_simplification.cpp b/ir_if_simplification.cpp index 042d0b677f..6882ef72b9 100644 --- a/ir_if_simplification.cpp +++ b/ir_if_simplification.cpp @@ -28,7 +28,6 @@ * instruction stream. */ -#define NULL 0 #include "ir.h" class ir_if_simplification_visitor : public ir_hierarchical_visitor { diff --git a/ir_print_visitor.cpp b/ir_print_visitor.cpp index 18ff48c3b3..40fac8803c 100644 --- a/ir_print_visitor.cpp +++ b/ir_print_visitor.cpp @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include <cstdio> + #include "ir_print_visitor.h" #include "glsl_types.h" #include "glsl_parser_extras.h" diff --git a/ir_reader.cpp b/ir_reader.cpp index 5cbce333f4..a8ccb30999 100644 --- a/ir_reader.cpp +++ b/ir_reader.cpp @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include <cstdio> + #include <cstdarg> extern "C" { diff --git a/ir_swizzle_swizzle.cpp b/ir_swizzle_swizzle.cpp index 8873bef8d6..0ffb4fa313 100644 --- a/ir_swizzle_swizzle.cpp +++ b/ir_swizzle_swizzle.cpp @@ -27,7 +27,6 @@ * Eliminates the second swizzle in a swizzle chain. */ -#include <stdio.h> #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" diff --git a/ir_variable.cpp b/ir_variable.cpp index 0c0d1278a4..49d8e3dcfb 100644 --- a/ir_variable.cpp +++ b/ir_variable.cpp @@ -21,10 +21,9 @@ * DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> +#include "ir.h" #include "glsl_parser_extras.h" #include "glsl_symbol_table.h" -#include "ir.h" #include "builtin_variables.h" #ifndef Elements diff --git a/ir_vec_index_to_swizzle.cpp b/ir_vec_index_to_swizzle.cpp index f0900cf70d..cb2f6ca409 100644 --- a/ir_vec_index_to_swizzle.cpp +++ b/ir_vec_index_to_swizzle.cpp @@ -29,7 +29,6 @@ * and codegen backends not have to worry about this case. */ -#include <stdio.h> #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" |