don't trust clion's move refactor :/

shady-gang · Oct 10, 2024 · 61ff407 · 61ff407
1 parent 356af2d
commit 61ff407
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/SPIRV-Headers b/SPIRV-Headers
diff --git a/src/shady/ir/annotation.c b/src/shady/ir/annotation.c
@@ -1,4 +1,5 @@
 #include "ir_private.h"
+
 #include "log.h"
 #include "portability.h"
 

diff --git a/src/shady/ir/builtin.c b/src/shady/ir/builtin.c
@@ -1,10 +1,11 @@
-#include "../../../include/shady/ir/builtin.h"
-#include "../../../include/shady/ir/annotation.h"
+#include "shady/ir/builtin.h"
+#include "shady/ir/annotation.h"
 
-#include "../../../SPIRV-Headers/include/spirv/unified1/spirv.h"
+#include "log.h"
+#include "portability.h"
+
+#include <spirv/unified1/spirv.h>
 
-#include "../../common/log.h"
-#include "../../common/portability.h"
 #include <string.h>
 
 static AddressSpace builtin_as[] = {

diff --git a/src/shady/ir/grammar.c b/src/shady/ir/grammar.c
@@ -1,10 +1,10 @@
-#include "../../../include/shady/ir/grammar.h"
+#include "shady/ir/grammar.h"
 
 #include "../fold.h"
 
-#include "../../common/log.h"
-#include "../../common/portability.h"
-#include "../../common/dict.h"
+#include "log.h"
+#include "portability.h"
+#include "dict.h"
 
 #include <string.h>
 #include <assert.h>
@@ -57,4 +57,4 @@ Node* _shd_create_node_helper(IrArena* arena, Node node, bool* pfresh) {
     return alloc;
 }
 
-#include "../../../cmake-build-debug/src/shady/constructors_generated.c"
+#include "../constructors_generated.c"
diff --git a/src/shady/ir/mem.c b/src/shady/ir/mem.c
@@ -1,4 +1,4 @@
-#include "../../../include/shady/ir.h"
+#include "shady/ir/grammar.h"
 
 #include <assert.h>
 

diff --git a/src/shady/ir/module.c b/src/shady/ir/module.c
@@ -1,7 +1,7 @@
 #include "../ir_private.h"
 
-#include "../../common/list.h"
-#include "../../common/portability.h"
+#include "list.h"
+#include "portability.h"
 
 #include <string.h>
+7 −5		CMakeLists.txt
+14 −10		include/spirv/spir-v.xml
+1 −1		include/spirv/unified1/NonSemanticVkspReflection.h
+6 −3		include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json
+106 −0		include/spirv/unified1/spirv.bf
+465 −107		include/spirv/unified1/spirv.core.grammar.json
+106 −0		include/spirv/unified1/spirv.cs
+1,873 −2		include/spirv/unified1/spirv.h
+1,877 −2		include/spirv/unified1/spirv.hpp
+1,877 −2		include/spirv/unified1/spirv.hpp11
+61 −4		include/spirv/unified1/spirv.json
+102 −0		include/spirv/unified1/spirv.lua
+51 −0		include/spirv/unified1/spirv.py
+106 −0		include/spirv/unified1/spv.d
+3 −3		tests/CMakeLists.txt
+64 −27		tools/buildHeaders/header.cpp
+75 −3		tools/buildHeaders/jsonToSpirv.cpp
+4 −1		tools/buildHeaders/jsonToSpirv.h