From: Ian Romanick Date: Fri, 14 Oct 2016 18:02:18 +0000 (-0700) Subject: glsl: Move builtin_function related prototypes to a separate file X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa38bf1e593eba3e65c4e10154410158d6d263c5;p=mesa.git glsl: Move builtin_function related prototypes to a separate file Signed-off-by: Ian Romanick Reviewed-by: Matt Turner --- diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index 063cf50be5b..3e16316669e 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -20,6 +20,7 @@ LIBGLSL_FILES = \ glsl/blob.c \ glsl/blob.h \ glsl/builtin_functions.cpp \ + glsl/builtin_functions.h \ glsl/builtin_types.cpp \ glsl/builtin_variables.cpp \ glsl/glsl_parser_extras.cpp \ diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp index 2a2c17bd42c..0665e0c3938 100644 --- a/src/compiler/glsl/ast_function.cpp +++ b/src/compiler/glsl/ast_function.cpp @@ -27,6 +27,7 @@ #include "ir.h" #include "main/core.h" /* for MIN2 */ #include "main/shaderobj.h" +#include "builtin_functions.h" static ir_rvalue * convert_component(ir_rvalue *src, const glsl_type *desired_type); diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 0cd552eb490..b31b61d1ed6 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -58,6 +58,7 @@ #include "main/shaderobj.h" #include "ir.h" #include "ir_builder.h" +#include "builtin_functions.h" using namespace ir_builder; diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 0749ba1d448..307cc58a6ea 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -61,6 +61,7 @@ #include "glsl_parser_extras.h" #include "program/prog_instruction.h" #include +#include "builtin_functions.h" #define M_PIf ((float) M_PI) #define M_PI_2f ((float) M_PI_2) diff --git a/src/compiler/glsl/builtin_functions.h b/src/compiler/glsl/builtin_functions.h new file mode 100644 index 00000000000..747b4fb2723 --- /dev/null +++ b/src/compiler/glsl/builtin_functions.h @@ -0,0 +1,46 @@ +/* + * Copyright © 2016 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef BULITIN_FUNCTIONS_H +#define BULITIN_FUNCTIONS_H + +extern void +_mesa_glsl_initialize_builtin_functions(); + +extern ir_function_signature * +_mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state, + const char *name, exec_list *actual_parameters); + +extern ir_function * +_mesa_glsl_find_builtin_function_by_name(const char *name); + +extern gl_shader * +_mesa_glsl_get_builtin_function_shader(void); + +extern ir_function_signature * +_mesa_get_main_function_signature(glsl_symbol_table *symbols); + +extern void +_mesa_glsl_release_builtin_functions(void); + +#endif /* BULITIN_FUNCTIONS_H */ diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index d6dac6d7de5..4eb275e9a6d 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -30,6 +30,7 @@ #include "main/uniforms.h" #include "program/prog_statevars.h" #include "program/prog_instruction.h" +#include "builtin_functions.h" using namespace ir_builder; diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index f542ce7f8ba..e888090f209 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -37,6 +37,7 @@ #include "glsl_parser.h" #include "ir_optimization.h" #include "loop_analysis.h" +#include "builtin_functions.h" /** * Format a short human-readable description of the given GLSL version. diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index afcbe295c39..4317c54d498 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -2383,25 +2383,6 @@ extern void _mesa_glsl_initialize_derived_variables(struct gl_context *ctx, gl_shader *shader); -extern void -_mesa_glsl_initialize_builtin_functions(); - -extern ir_function_signature * -_mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state, - const char *name, exec_list *actual_parameters); - -extern ir_function * -_mesa_glsl_find_builtin_function_by_name(const char *name); - -extern gl_shader * -_mesa_glsl_get_builtin_function_shader(void); - -extern ir_function_signature * -_mesa_get_main_function_signature(glsl_symbol_table *symbols); - -extern void -_mesa_glsl_release_builtin_functions(void); - extern void reparent_ir(exec_list *list, void *mem_ctx); diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 61dfa556810..fb26be48950 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -80,6 +80,7 @@ #include "ir_optimization.h" #include "ir_rvalue_visitor.h" #include "ir_uniform.h" +#include "builtin_functions.h" #include "main/shaderobj.h" #include "main/enums.h" diff --git a/src/compiler/glsl/lower_blend_equation_advanced.cpp b/src/compiler/glsl/lower_blend_equation_advanced.cpp index 4f9cd8387ff..c6db58142cd 100644 --- a/src/compiler/glsl/lower_blend_equation_advanced.cpp +++ b/src/compiler/glsl/lower_blend_equation_advanced.cpp @@ -28,6 +28,7 @@ #include "program/prog_instruction.h" #include "program/prog_statevars.h" #include "util/bitscan.h" +#include "builtin_functions.h" using namespace ir_builder; diff --git a/src/compiler/glsl/lower_vertex_id.cpp b/src/compiler/glsl/lower_vertex_id.cpp index 412b97e527b..6b41fee055a 100644 --- a/src/compiler/glsl/lower_vertex_id.cpp +++ b/src/compiler/glsl/lower_vertex_id.cpp @@ -37,6 +37,7 @@ #include "ir_builder.h" #include "linker.h" #include "program/prog_statevars.h" +#include "builtin_functions.h" namespace { diff --git a/src/compiler/glsl/standalone.cpp b/src/compiler/glsl/standalone.cpp index 9a8d75d2863..44f2c0f36b1 100644 --- a/src/compiler/glsl/standalone.cpp +++ b/src/compiler/glsl/standalone.cpp @@ -41,6 +41,7 @@ #include "linker.h" #include "glsl_parser_extras.h" #include "ir_builder_print_visitor.h" +#include "builtin_functions.h" #include "opt_add_neg_to_sub.h" class dead_variable_visitor : public ir_hierarchical_visitor {