From 13434162abbc69b67088f4d55faebe95ea6c478d Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 20 Jul 2020 14:51:03 -0400 Subject: [PATCH] Don't make the MOJOSHADER_DO_INSTRUCTION_TABLE caller undef everything after. --- mojoshader.c | 4 ---- mojoshader_assembler.c | 3 --- mojoshader_internal.h | 5 +++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mojoshader.c b/mojoshader.c index dfd8b5c9..0ccb0723 100644 --- a/mojoshader.c +++ b/mojoshader.c @@ -1985,10 +1985,6 @@ static const Instruction instructions[] = #define MOJOSHADER_DO_INSTRUCTION_TABLE 1 #include "mojoshader_internal.h" - #undef MOJOSHADER_DO_INSTRUCTION_TABLE - - #undef INSTRUCTION - #undef INSTRUCTION_STATE }; diff --git a/mojoshader_assembler.c b/mojoshader_assembler.c index abb85821..53156362 100644 --- a/mojoshader_assembler.c +++ b/mojoshader_assembler.c @@ -1096,9 +1096,6 @@ static const Instruction instructions[] = #define INSTRUCTION(op, opstr, slots, a, t) { opstr, parse_args_##a }, #define MOJOSHADER_DO_INSTRUCTION_TABLE 1 #include "mojoshader_internal.h" - #undef MOJOSHADER_DO_INSTRUCTION_TABLE - #undef INSTRUCTION - #undef INSTRUCTION_STATE }; diff --git a/mojoshader_internal.h b/mojoshader_internal.h index 95d3a451..8da37257 100644 --- a/mojoshader_internal.h +++ b/mojoshader_internal.h @@ -870,6 +870,11 @@ INSTRUCTION(TEXLDD, "TEXLDD", 3, DSSSS, MOJOSHADER_TYPE_PIXEL) INSTRUCTION_STATE(SETP, "SETP", 1, DSS, MOJOSHADER_TYPE_ANY) INSTRUCTION_STATE(TEXLDL, "TEXLDL", 2, DSS, MOJOSHADER_TYPE_ANY) INSTRUCTION_STATE(BREAKP, "BREAKP", 3, S, MOJOSHADER_TYPE_ANY) + +#undef MOJOSHADER_DO_INSTRUCTION_TABLE +#undef INSTRUCTION +#undef INSTRUCTION_STATE + #endif // end of mojoshader_internal.h ...