Merge remote-tracking branch 'upstream/master'

Author: TheJackiMonster

.gitmodules

@@ -1,6 +1,4 @@
-[submodule "murmur3"]
-	path = murmur3
-	url = https://github.com/PeterScott/murmur3
 [submodule "SPIRV-Headers"]
 	path = SPIRV-Headers
 	url = https://github.com/shady-gang/SPIRV-Headers.git
+	branch = main

SPIRV-Headers

@@ -12,7 +12,7 @@ If you have a good reason for breaking any of those rules we're happy to conside
  * `{ spaces, surrounding, initializer, lists }`
  * Unless you're literally contributing using a 80-column display (for which I'll ask visual proof), don't format your code as if you do.
  * Include order: 
-   * If appropriate, (Private) `self.h` should always come first
+   * If appropriate, (Private) `self.h` should always come first, with other local headers in the same group
    * Then other `shady/` headers
    * Then in-project utility headers
    * Then external headers
@@ -26,6 +26,7 @@ Due to C not having namespaces, we have to deal with this painfully automatable
  * Avoid exposing any symbols that don't need to be exposed (use `static` wherever you can)
  * Prefixes:
    * `shd_` in front of API functions (in the root `include` folder)
+     * `slim_`, `l2s_`, `spv_` and `vcc_` are used in various sub-projects
    * `subsystem_` is acceptable for internal use
    * `shd_subsystem_` is preferable where a clear delineation can be made
    * `shd_new_thing` and `shd_destroy_thing` for constructors and destructors

doc/code_style.md

@@ -18,7 +18,7 @@ typedef struct {
     int glsl_version;
 } CEmitterConfig;
 
-CEmitterConfig default_c_emitter_config(void);
+CEmitterConfig shd_default_c_emitter_config(void);
 
 typedef struct CompilerConfig_ CompilerConfig;
 void shd_emit_c(const CompilerConfig* compiler_config, CEmitterConfig config, Module* mod, size_t* output_size, char** output, Module** new_mod);

include/shady/be/c.h

@@ -9,8 +9,8 @@
 void shd_dump_module(Module* mod);
 void shd_dump_node(const Node* node);
 
-void dump_cfgs(FILE* output, Module* mod);
-void dump_loop_trees(FILE* output, Module* mod);
+void shd_dump_cfgs(FILE* output, Module* mod);
+void shd_dump_loop_trees(FILE* output, Module* mod);
 
 #endif
 

include/shady/be/dump.h

@@ -4,7 +4,7 @@
 #include "shady/ir/base.h"
 
 typedef struct CompilerConfig_ CompilerConfig;
-void emit_spirv(const CompilerConfig* config, Module*, size_t* output_size, char** output, Module** new_mod);
+void shd_emit_spirv(const CompilerConfig* config, Module* mod, size_t* output_size, char** output, Module** new_mod);
 
 #endif
 

include/shady/be/spirv.h

@@ -4,17 +4,6 @@
 #include "shady/ir/module.h"
 #include "shady/config.h"
 
-typedef enum {
-    SlimOpDereference,
-    SlimOpAssign,
-    SlimOpAddrOf,
-    SlimOpSubscript,
-    SlimOpBindVal,
-    SlimOpBindVar,
-    SlimOpBindContinuations,
-    SlimOpUnbound,
-} SlimFrontEndOpCodes;
-
 typedef struct {
     bool front_end;
 } SlimParserConfig;

include/shady/body_builder.h

@@ -19,7 +19,7 @@
 #include "shady/ir/function.h"
 #include "shady/ir/decl.h"
 
-#include "shady/body_builder.h"
+#include "shady/ir/builder.h"
 #include "shady/analysis/literal.h"
 
 #endif

include/shady/fe/slim.h

@@ -44,11 +44,11 @@ Nodes shd_concat_nodes(IrArena* arena, Nodes a, Nodes b);
 Nodes shd_change_node_at_index(IrArena* arena, Nodes old, size_t i, const Node* n);
 bool shd_find_in_nodes(Nodes nodes, const Node* n);
 
-String string_sized(IrArena*, size_t size, const char* start);
-String string(IrArena*, const char*);
+String shd_string_sized(IrArena*, size_t size, const char* start);
+String shd_string(IrArena*, const char*);
 
 // see also: format_string in util.h
 String shd_fmt_string_irarena(IrArena* arena, const char* str, ...);
-String unique_name(IrArena*, const char* base_name);
+String shd_make_unique_name(IrArena* arena, const char* str);
 
 #endif