Skip to content
Snippets Groups Projects

vkd3d-shader/preproc: Store argument values per expansion, not per macro.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:mr2 into master
4 files
+ 38
35
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -60,6 +60,7 @@ struct preproc_expansion
{
struct preproc_buffer buffer;
const struct preproc_text *text;
struct preproc_text *arg_values;
/* Back-pointer to the macro, if this expansion a macro body. This is
* necessary so that argument tokens can be correctly replaced. */
struct preproc_macro *macro;
@@ -72,7 +73,6 @@ struct preproc_macro
char **arg_names;
size_t arg_count;
struct preproc_text *arg_values;
struct preproc_text body;
};
@@ -117,6 +117,7 @@ struct preproc_ctx
STATE_ARGS,
} state;
unsigned int paren_depth;
struct preproc_text *arg_values;
} text_func, directive_func;
int current_directive;
Loading