diff options
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/apps/compile.c | 1 | ||||
-rw-r--r-- | src/glsl/apps/process.c | 2 | ||||
-rw-r--r-- | src/glsl/apps/purify.c | 1 | ||||
-rw-r--r-- | src/glsl/apps/tokenise.c | 2 | ||||
-rw-r--r-- | src/glsl/apps/version.c | 1 | ||||
-rw-r--r-- | src/glsl/cl/sl_cl_parse.c | 1 | ||||
-rw-r--r-- | src/glsl/cl/sl_cl_parse.h | 2 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_context.c | 1 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_context.h | 1 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_define.c | 2 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_error.c | 1 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_expression.c | 2 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_expression.h | 4 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_extension.c | 2 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_if.c | 3 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_line.c | 2 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_macro.c | 1 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_macro.h | 3 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_pragma.c | 1 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_process.c | 3 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_process.h | 5 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_public.h | 8 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_token_util.c | 1 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_token_util.h | 5 | ||||
-rw-r--r-- | src/glsl/pp/sl_pp_version.c | 1 |
25 files changed, 35 insertions, 21 deletions
diff --git a/src/glsl/apps/compile.c b/src/glsl/apps/compile.c index 3aa4fd4d53e..5114fc9d0be 100644 --- a/src/glsl/apps/compile.c +++ b/src/glsl/apps/compile.c @@ -30,6 +30,7 @@ #include <string.h> #include <assert.h> #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" #include "../cl/sl_cl_parse.h" diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c index caf72a71cf1..6d5ce6eea3f 100644 --- a/src/glsl/apps/process.c +++ b/src/glsl/apps/process.c @@ -30,6 +30,8 @@ #include <string.h> #include <assert.h> #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" +#include "../pp/sl_pp_token.h" int diff --git a/src/glsl/apps/purify.c b/src/glsl/apps/purify.c index 0f09b157efd..e3fca59ab45 100644 --- a/src/glsl/apps/purify.c +++ b/src/glsl/apps/purify.c @@ -30,6 +30,7 @@ #include <stdlib.h> #include <string.h> #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" int diff --git a/src/glsl/apps/tokenise.c b/src/glsl/apps/tokenise.c index f89f47d0611..3d68334bed3 100644 --- a/src/glsl/apps/tokenise.c +++ b/src/glsl/apps/tokenise.c @@ -30,6 +30,8 @@ #include <string.h> #include <assert.h> #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" +#include "../pp/sl_pp_token.h" int diff --git a/src/glsl/apps/version.c b/src/glsl/apps/version.c index fa5c226da83..8506f35ba11 100644 --- a/src/glsl/apps/version.c +++ b/src/glsl/apps/version.c @@ -30,6 +30,7 @@ #include <string.h> #include <assert.h> #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" int diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c index 09456f5219a..c1bc6031ce6 100644 --- a/src/glsl/cl/sl_cl_parse.c +++ b/src/glsl/cl/sl_cl_parse.c @@ -29,6 +29,7 @@ #include <stdlib.h> #include <string.h> #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_token.h" #include "sl_cl_parse.h" diff --git a/src/glsl/cl/sl_cl_parse.h b/src/glsl/cl/sl_cl_parse.h index dd5791d5901..a954d439276 100644 --- a/src/glsl/cl/sl_cl_parse.h +++ b/src/glsl/cl/sl_cl_parse.h @@ -28,6 +28,8 @@ #ifndef SL_CL_PARSE_H #define SL_CL_PARSE_H +struct sl_pp_context; + int sl_cl_compile(struct sl_pp_context *context, unsigned int shader_type, diff --git a/src/glsl/pp/sl_pp_context.c b/src/glsl/pp/sl_pp_context.c index 74a9bdddfdc..b8e1e99fc86 100644 --- a/src/glsl/pp/sl_pp_context.c +++ b/src/glsl/pp/sl_pp_context.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include <string.h> +#include "sl_pp_macro.h" #include "sl_pp_public.h" #include "sl_pp_context.h" diff --git a/src/glsl/pp/sl_pp_context.h b/src/glsl/pp/sl_pp_context.h index 8abb9708b85..e6244f62575 100644 --- a/src/glsl/pp/sl_pp_context.h +++ b/src/glsl/pp/sl_pp_context.h @@ -29,7 +29,6 @@ #define SL_PP_CONTEXT_H #include "sl_pp_dict.h" -#include "sl_pp_macro.h" #include "sl_pp_process.h" #include "sl_pp_purify.h" #include "sl_pp_token_util.h" diff --git a/src/glsl/pp/sl_pp_define.c b/src/glsl/pp/sl_pp_define.c index 808a6a0d4f1..370e6aa6606 100644 --- a/src/glsl/pp/sl_pp_define.c +++ b/src/glsl/pp/sl_pp_define.c @@ -28,8 +28,10 @@ #include <stdlib.h> #include <string.h> #include "sl_pp_context.h" +#include "sl_pp_macro.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" static void diff --git a/src/glsl/pp/sl_pp_error.c b/src/glsl/pp/sl_pp_error.c index b628e37ce83..482b67fcafb 100644 --- a/src/glsl/pp/sl_pp_error.c +++ b/src/glsl/pp/sl_pp_error.c @@ -30,6 +30,7 @@ #include "sl_pp_context.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" void diff --git a/src/glsl/pp/sl_pp_expression.c b/src/glsl/pp/sl_pp_expression.c index ec904787dd7..c3f48356b09 100644 --- a/src/glsl/pp/sl_pp_expression.c +++ b/src/glsl/pp/sl_pp_expression.c @@ -27,8 +27,10 @@ #include <stdlib.h> #include <string.h> +#include "sl_pp_context.h" #include "sl_pp_expression.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" struct parse_context { diff --git a/src/glsl/pp/sl_pp_expression.h b/src/glsl/pp/sl_pp_expression.h index 377d5b4cbd9..522263bb259 100644 --- a/src/glsl/pp/sl_pp_expression.h +++ b/src/glsl/pp/sl_pp_expression.h @@ -28,8 +28,8 @@ #ifndef SL_PP_EXPRESSION_H #define SL_PP_EXPRESSION_H -#include "sl_pp_context.h" -#include "sl_pp_token.h" +struct sl_pp_context; +struct sl_pp_token_info; int diff --git a/src/glsl/pp/sl_pp_extension.c b/src/glsl/pp/sl_pp_extension.c index d119677c268..00dbdcf22bc 100644 --- a/src/glsl/pp/sl_pp_extension.c +++ b/src/glsl/pp/sl_pp_extension.c @@ -25,11 +25,13 @@ * **************************************************************************/ +#include <assert.h> #include <stdlib.h> #include <string.h> #include "sl_pp_context.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" /** diff --git a/src/glsl/pp/sl_pp_if.c b/src/glsl/pp/sl_pp_if.c index 25cb7a3ca11..6b7a1590b42 100644 --- a/src/glsl/pp/sl_pp_if.c +++ b/src/glsl/pp/sl_pp_if.c @@ -27,8 +27,11 @@ #include <stdlib.h> #include <string.h> +#include "sl_pp_context.h" #include "sl_pp_expression.h" +#include "sl_pp_macro.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" static int diff --git a/src/glsl/pp/sl_pp_line.c b/src/glsl/pp/sl_pp_line.c index 6f7e9eb562c..51581c7bb59 100644 --- a/src/glsl/pp/sl_pp_line.c +++ b/src/glsl/pp/sl_pp_line.c @@ -28,8 +28,10 @@ #include <stdlib.h> #include <string.h> #include "sl_pp_context.h" +#include "sl_pp_macro.h" #include "sl_pp_public.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_macro.c b/src/glsl/pp/sl_pp_macro.c index 9f520b8fc53..2cf9ea342b2 100644 --- a/src/glsl/pp/sl_pp_macro.c +++ b/src/glsl/pp/sl_pp_macro.c @@ -32,6 +32,7 @@ #include "sl_pp_public.h" #include "sl_pp_macro.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" static void diff --git a/src/glsl/pp/sl_pp_macro.h b/src/glsl/pp/sl_pp_macro.h index 1d210681091..6e65a0a588d 100644 --- a/src/glsl/pp/sl_pp_macro.h +++ b/src/glsl/pp/sl_pp_macro.h @@ -28,9 +28,6 @@ #ifndef SL_PP_MACRO_H #define SL_PP_MACRO_H -#include "sl_pp_token.h" - - struct sl_pp_context; struct sl_pp_process_state; struct sl_pp_token_buffer; diff --git a/src/glsl/pp/sl_pp_pragma.c b/src/glsl/pp/sl_pp_pragma.c index caf4c63f657..6789704db0c 100644 --- a/src/glsl/pp/sl_pp_pragma.c +++ b/src/glsl/pp/sl_pp_pragma.c @@ -29,6 +29,7 @@ #include <string.h> #include "sl_pp_context.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_process.c b/src/glsl/pp/sl_pp_process.c index 315ad9bf1cd..2f12393237c 100644 --- a/src/glsl/pp/sl_pp_process.c +++ b/src/glsl/pp/sl_pp_process.c @@ -25,11 +25,14 @@ * **************************************************************************/ +#include <assert.h> #include <stdlib.h> #include <string.h> #include "sl_pp_context.h" +#include "sl_pp_macro.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_process.h b/src/glsl/pp/sl_pp_process.h index fe6ff0d4648..04e9be43989 100644 --- a/src/glsl/pp/sl_pp_process.h +++ b/src/glsl/pp/sl_pp_process.h @@ -28,11 +28,8 @@ #ifndef SL_PP_PROCESS_H #define SL_PP_PROCESS_H -#include "sl_pp_macro.h" -#include "sl_pp_token.h" - - struct sl_pp_context; +struct sl_pp_token_buffer; struct sl_pp_process_state { struct sl_pp_token_info *out; diff --git a/src/glsl/pp/sl_pp_public.h b/src/glsl/pp/sl_pp_public.h index ca6f722543d..66ced6cf589 100644 --- a/src/glsl/pp/sl_pp_public.h +++ b/src/glsl/pp/sl_pp_public.h @@ -28,13 +28,9 @@ #ifndef SL_PP_PUBLIC_H #define SL_PP_PUBLIC_H - struct sl_pp_context; - - -#include "sl_pp_purify.h" -#include "sl_pp_token.h" - +struct sl_pp_purify_options; +struct sl_pp_token_info; struct sl_pp_context * sl_pp_context_create(const char *input, diff --git a/src/glsl/pp/sl_pp_token_util.c b/src/glsl/pp/sl_pp_token_util.c index c85263d9a11..43be49670b0 100644 --- a/src/glsl/pp/sl_pp_token_util.c +++ b/src/glsl/pp/sl_pp_token_util.c @@ -28,6 +28,7 @@ #include <assert.h> #include <stdlib.h> #include "sl_pp_token_util.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_token_util.h b/src/glsl/pp/sl_pp_token_util.h index 2a668ad0a84..35d72101ca5 100644 --- a/src/glsl/pp/sl_pp_token_util.h +++ b/src/glsl/pp/sl_pp_token_util.h @@ -28,11 +28,6 @@ #ifndef SL_PP_TOKEN_UTIL_H #define SL_PP_TOKEN_UTIL_H -#include <assert.h> -#include <stdlib.h> -#include "sl_pp_token.h" - - struct sl_pp_context; /* diff --git a/src/glsl/pp/sl_pp_version.c b/src/glsl/pp/sl_pp_version.c index 3c995b77501..6735c05e8ae 100644 --- a/src/glsl/pp/sl_pp_version.c +++ b/src/glsl/pp/sl_pp_version.c @@ -29,6 +29,7 @@ #include <string.h> #include "sl_pp_public.h" #include "sl_pp_context.h" +#include "sl_pp_token.h" int |