mirror of
https://github.com/godotengine/godot-nir-static.git
synced 2026-01-04 06:09:47 +03:00
Update mesa to 23.1.9
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
.sconsign.dblite
|
.sconsign.dblite
|
||||||
bin/
|
bin/
|
||||||
godot-mesa/
|
godot-mesa/
|
||||||
|
*.pyc
|
||||||
|
|||||||
2
.gitmodules
vendored
2
.gitmodules
vendored
@@ -1,3 +1,3 @@
|
|||||||
[submodule "mesa"]
|
[submodule "mesa"]
|
||||||
path = mesa
|
path = mesa
|
||||||
url = https://github.com/Mesa3D/mesa
|
url = https://gitlab.freedesktop.org/mesa/mesa
|
||||||
|
|||||||
@@ -322,6 +322,7 @@ else:
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
env.Append(CFLAGS=["-std=c11"])
|
env.Append(CFLAGS=["-std=c11"])
|
||||||
|
env.Append(CXXFLAGS=["-fno-exceptions"])
|
||||||
|
|
||||||
if env.get("use_llvm", False):
|
if env.get("use_llvm", False):
|
||||||
extra_defines += [
|
extra_defines += [
|
||||||
|
|||||||
@@ -718,14 +718,15 @@ index 245c5140f9..d6c9d06c30 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const struct dxil_value *
|
static const struct dxil_value *
|
||||||
@@ -5079,6 +5083,11 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
|
@@ -5079,6 +5083,12 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
|
||||||
case nir_intrinsic_exclusive_scan:
|
case nir_intrinsic_exclusive_scan:
|
||||||
return emit_reduce(ctx, intr);
|
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);
|
+ const struct dxil_value* value = get_src(ctx, &intr->src[0], 0, nir_type_uint);
|
||||||
+ store_dest_value(ctx, &intr->dest, 0, value);
|
+ store_dest_value(ctx, &intr->dest, 0, value);
|
||||||
+ return true;
|
+ return true;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
case nir_intrinsic_load_num_workgroups:
|
case nir_intrinsic_load_num_workgroups:
|
||||||
case nir_intrinsic_load_workgroup_size:
|
case nir_intrinsic_load_workgroup_size:
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
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:
|
|
||||||
Binary file not shown.
Binary file not shown.
@@ -23,8 +23,13 @@ def generate(env):
|
|||||||
if not env["use_mingw"] and msvc.exists(env):
|
if not env["use_mingw"] and msvc.exists(env):
|
||||||
if env["arch"] == "x86_64":
|
if env["arch"] == "x86_64":
|
||||||
env["TARGET_ARCH"] = "amd64"
|
env["TARGET_ARCH"] = "amd64"
|
||||||
|
elif env["arch"] == "arm64":
|
||||||
|
env["TARGET_ARCH"] = "arm64"
|
||||||
|
elif env["arch"] == "arm32":
|
||||||
|
env["TARGET_ARCH"] = "arm"
|
||||||
elif env["arch"] == "x86_32":
|
elif env["arch"] == "x86_32":
|
||||||
env["TARGET_ARCH"] = "x86"
|
env["TARGET_ARCH"] = "x86"
|
||||||
|
|
||||||
env["is_msvc"] = True
|
env["is_msvc"] = True
|
||||||
|
|
||||||
# MSVC, linker, and archiver.
|
# MSVC, linker, and archiver.
|
||||||
@@ -63,7 +68,15 @@ def generate(env):
|
|||||||
else:
|
else:
|
||||||
env["use_mingw"] = True
|
env["use_mingw"] = True
|
||||||
# Cross-compilation using MinGW
|
# Cross-compilation using MinGW
|
||||||
prefix = "i686" if env["arch"] == "x86_32" else env["arch"]
|
if env["arch"] == "x86_64":
|
||||||
|
prefix = "x86_64"
|
||||||
|
elif env["arch"] == "arm64":
|
||||||
|
prefix = "aarch64"
|
||||||
|
elif env["arch"] == "arm32":
|
||||||
|
prefix = "armv7"
|
||||||
|
elif env["arch"] == "x86_32":
|
||||||
|
prefix = "i686"
|
||||||
|
|
||||||
if env["use_llvm"]:
|
if env["use_llvm"]:
|
||||||
env["CXX"] = prefix + "-w64-mingw32-clang"
|
env["CXX"] = prefix + "-w64-mingw32-clang"
|
||||||
env["CC"] = prefix + "-w64-mingw32-clang++"
|
env["CC"] = prefix + "-w64-mingw32-clang++"
|
||||||
|
|||||||
2
mesa
2
mesa
Submodule mesa updated: 9085c9d43e...52ab5584b8
Reference in New Issue
Block a user