Merge pull request #3 from superxkooda/clangarm64

Modifications to get compiled in msys2 on arm64
This commit is contained in:
bruvzg
2024-01-08 09:04:02 +02:00
committed by GitHub
2 changed files with 24 additions and 0 deletions

View File

@@ -310,6 +310,12 @@ else:
)
env.Append(CFLAGS=["-std=c11"])
if env.get("use_llvm", False):
extra_defines += [
"HAVE_TIMESPEC_GET",
"_UCRT",
]
env.Append(CPPDEFINES=extra_defines)
env.Append(CPPPATH=".")
env.Append(CPPPATH="#vulkan/include")

View File

@@ -0,0 +1,18 @@
diff --git a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
index d6c9d06..1e8e9ea 100644
--- a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
+++ b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
@@ -5083,11 +5083,11 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
case nir_intrinsic_exclusive_scan:
return emit_reduce(ctx, intr);
- case nir_intrinsic_load_constant_non_opt:
+ case nir_intrinsic_load_constant_non_opt: {
const struct dxil_value* value = get_src(ctx, &intr->src[0], 0, nir_type_uint);
store_dest_value(ctx, &intr->dest, 0, value);
return true;
-
+ }
case nir_intrinsic_load_num_workgroups:
case nir_intrinsic_load_workgroup_size:
default: