Moved some simple things into mojoshader_common.c.

This lets you build without mojoshader.c at all, if you're doing just the compiler, etc, and don't need all the bytecode parsing.
icculus · Jan 3, 2015 · 24884bb · 24884bb
1 parent 44bf450
commit 24884bb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/mojoshader.c b/mojoshader.c
@@ -270,22 +270,6 @@ typedef struct Profile
 } Profile;
 
 
-// Convenience functions for allocators...
-#if !MOJOSHADER_FORCE_ALLOCATOR
-void *MOJOSHADER_internal_malloc(int bytes, void *d) { return malloc(bytes); }
-void MOJOSHADER_internal_free(void *ptr, void *d) { free(ptr); }
-#endif
-
-MOJOSHADER_error MOJOSHADER_out_of_mem_error = {
-    "Out of memory", NULL, MOJOSHADER_POSITION_NONE
-};
-
-MOJOSHADER_parseData MOJOSHADER_out_of_mem_data = {
-    1, &MOJOSHADER_out_of_mem_error, 0, 0, 0, 0,
-    MOJOSHADER_TYPE_UNKNOWN, 0, 0, 0, 0
-};
-
-
 // !!! FIXME: cut and paste between every damned source file follows...
 // !!! FIXME: We need to make some sort of ContextBase that applies to all
 // !!! FIXME:  files and move this stuff to mojoshader_common.c ...

diff --git a/mojoshader_common.c b/mojoshader_common.c
@@ -1,6 +1,22 @@
 #define __MOJOSHADER_INTERNAL__ 1
 #include "mojoshader_internal.h"
 
+// Convenience functions for allocators...
+#if !MOJOSHADER_FORCE_ALLOCATOR
+void *MOJOSHADER_internal_malloc(int bytes, void *d) { return malloc(bytes); }
+void MOJOSHADER_internal_free(void *ptr, void *d) { free(ptr); }
+#endif
+
+MOJOSHADER_error MOJOSHADER_out_of_mem_error = {
+    "Out of memory", NULL, MOJOSHADER_POSITION_NONE
+};
+
+MOJOSHADER_parseData MOJOSHADER_out_of_mem_data = {
+    1, &MOJOSHADER_out_of_mem_error, 0, 0, 0, 0,
+    MOJOSHADER_TYPE_UNKNOWN, 0, 0, 0, 0
+};
+
+
 typedef struct HashItem
 {
     const void *key;