Merge branch 'glsl-pp-rework-2'

[mesa.git] / src / glsl / pp / sl_pp_macro.h

diff --git a/src/glsl/pp/sl_pp_macro.h b/src/glsl/pp/sl_pp_macro.h
index 7af11c5ece77241a30676e680941dc151b9cb14c..3ad3438236a660c59d55942508fb5190b990be2e 100644 (file)
--- a/src/glsl/pp/sl_pp_macro.h
+++ b/src/glsl/pp/sl_pp_macro.h
@@ -31,6 +31,9 @@
 #include "sl_pp_token.h"
 
 
+struct sl_pp_context;
+struct sl_pp_process_state;
+
 struct sl_pp_macro_formal_arg {
    int name;
    struct sl_pp_macro_formal_arg *next;
@@ -53,12 +56,18 @@ sl_pp_macro_free(struct sl_pp_macro *macro);
 void
 sl_pp_macro_reset(struct sl_pp_macro *macro);
 
+enum sl_pp_macro_expand_behaviour {
+   sl_pp_macro_expand_normal,
+   sl_pp_macro_expand_mute,
+   sl_pp_macro_expand_unknown_to_0
+};
+
 int
 sl_pp_macro_expand(struct sl_pp_context *context,
                    const struct sl_pp_token_info *input,
                    unsigned int *pi,
                    struct sl_pp_macro *local,
                    struct sl_pp_process_state *state,
-                   int mute);
+                   enum sl_pp_macro_expand_behaviour behaviour);
 
 #endif /* SL_PP_MACRO_H */