Don't make the MOJOSHADER_DO_INSTRUCTION_TABLE caller undef everythin…

…g after.
icculus · Jul 20, 2020 · 1343416 · 1343416
1 parent 1d735fd
commit 1343416
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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 ...