fix vcc include paths when testing on multi-config targets like MSVC

Author: Hugobros3

src/driver/vcc.c

@@ -13,6 +13,7 @@
 typedef struct {
     char* tmp_filename;
     bool delete_tmp_file;
+    char* include_path;
 } VccOptions;
 
 static void cli_parse_vcc_args(VccOptions* options, int* pargc, char** argv) {
@@ -26,6 +27,13 @@ static void cli_parse_vcc_args(VccOptions* options, int* pargc, char** argv) {
             options->delete_tmp_file = false;
             options->tmp_filename = "vcc_tmp.ll";
             continue;
+        } else if (strcmp(argv[i], "--vcc-include-path") == 0) {
+            argv[i] = NULL;
+            i++;
+            if (i == argc)
+                error("Missing subgroup size name");
+            options->include_path = argv[i];
+            continue;
         }
     }
 
@@ -81,7 +89,10 @@ int main(int argc, char** argv) {
     growy_append_string(g, "clang");
     char* self_path = get_executable_location();
     char* working_dir = strip_path(self_path);
-    growy_append_formatted(g, " -c -emit-llvm -S -g -O0 -ffreestanding -Wno-main-return-type -Xclang -fpreserve-vec3-type --target=spir64-unknown-unknown -isystem\"%s/../share/vcc/include/\" -D__SHADY__=1", working_dir);
+    if (!vcc_options.include_path) {
+        vcc_options.include_path = format_string_interned(arena, "%s/../share/vcc/include/", working_dir);
+    }
+    growy_append_formatted(g, " -c -emit-llvm -S -g -O0 -ffreestanding -Wno-main-return-type -Xclang -fpreserve-vec3-type --target=spir64-unknown-unknown -isystem\"%s\" -D__SHADY__=1", vcc_options.include_path);
     free(working_dir);
     free(self_path);
     growy_append_formatted(g, " -o %s", vcc_options.tmp_filename);

test/vcc/CMakeLists.txt

@@ -1,18 +1,20 @@
 list(APPEND VCC_SIMPLE_TESTS empty.c)
 list(APPEND VCC_SIMPLE_TESTS address_spaces.c)
 
+set(VCC_TEST_ARGS --vcc-include-path "${PROJECT_BINARY_DIR}/share/vcc/include/")
+
 foreach(T IN LISTS VCC_SIMPLE_TESTS)
-    add_test(NAME "test/vcc/${T}" COMMAND vcc ${PROJECT_SOURCE_DIR}/test/vcc/${T})
+    add_test(NAME "test/vcc/${T}" COMMAND vcc ${PROJECT_SOURCE_DIR}/test/vcc/${T} ${VCC_TEST_ARGS})
 endforeach()
 
-spv_outputting_test(NAME test/vcc/branch.c COMPILER vcc EXTRA_ARGS)
-spv_outputting_test(NAME test/vcc/loop.c COMPILER vcc EXTRA_ARGS)
-spv_outputting_test(NAME test/vcc/goto.c COMPILER vcc EXTRA_ARGS)
+spv_outputting_test(NAME test/vcc/branch.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS})
+spv_outputting_test(NAME test/vcc/loop.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS})
+spv_outputting_test(NAME test/vcc/goto.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS})
 
-spv_outputting_test(NAME test/vcc/vec_swizzle.c COMPILER vcc EXTRA_ARGS --entry-point test --no-dynamic-scheduling --execution-model Fragment)
+spv_outputting_test(NAME test/vcc/vec_swizzle.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS} --entry-point test --no-dynamic-scheduling --execution-model Fragment)
 
-spv_outputting_test(NAME test/vcc/empty.comp.c COMPILER vcc EXTRA_ARGS --entry-point main)
+spv_outputting_test(NAME test/vcc/empty.comp.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS} --entry-point main)
 
-spv_outputting_test(NAME test/vcc/simple.frag.c COMPILER vcc EXTRA_ARGS --entry-point main --no-dynamic-scheduling --execution-model Fragment)
-spv_outputting_test(NAME test/vcc/checkerboard.frag.c COMPILER vcc EXTRA_ARGS --entry-point main --no-dynamic-scheduling --execution-model Fragment)
-spv_outputting_test(NAME test/vcc/textured.frag.c COMPILER vcc EXTRA_ARGS --entry-point main --no-dynamic-scheduling --execution-model Fragment)
+spv_outputting_test(NAME test/vcc/simple.frag.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS} --entry-point main --no-dynamic-scheduling --execution-model Fragment)
+spv_outputting_test(NAME test/vcc/checkerboard.frag.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS} --entry-point main --no-dynamic-scheduling --execution-model Fragment)
+spv_outputting_test(NAME test/vcc/textured.frag.c COMPILER vcc EXTRA_ARGS ${VCC_TEST_ARGS} --entry-point main --no-dynamic-scheduling --execution-model Fragment)