From 0985547d67ee21c7efc954364dfa6da7cddad22a Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Tue, 30 Jan 2024 19:13:01 +0200 Subject: [PATCH] Update mesa to 23.1.9 --- .gitignore | 1 + .gitmodules | 2 +- SConstruct | 1 + godot-patches/01_godot_nir_goodies.patch | 5 +++-- .../02_Add_Curly_Braces_nir_to_dxil.c.patch | 18 ------------------ .../__pycache__/windows.cpython-310.pyc | Bin 2369 -> 0 bytes .../__pycache__/windows.cpython-311.pyc | Bin 4580 -> 0 bytes godot-tools/windows.py | 15 ++++++++++++++- mesa | 2 +- 9 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 godot-patches/02_Add_Curly_Braces_nir_to_dxil.c.patch delete mode 100644 godot-tools/__pycache__/windows.cpython-310.pyc delete mode 100644 godot-tools/__pycache__/windows.cpython-311.pyc diff --git a/.gitignore b/.gitignore index 5949b9c..b262b05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .sconsign.dblite bin/ godot-mesa/ +*.pyc diff --git a/.gitmodules b/.gitmodules index 2351efa..98fd5e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "mesa"] path = mesa - url = https://github.com/Mesa3D/mesa + url = https://gitlab.freedesktop.org/mesa/mesa diff --git a/SConstruct b/SConstruct index e496194..f71f2cf 100644 --- a/SConstruct +++ b/SConstruct @@ -322,6 +322,7 @@ else: ] ) env.Append(CFLAGS=["-std=c11"]) + env.Append(CXXFLAGS=["-fno-exceptions"]) if env.get("use_llvm", False): extra_defines += [ diff --git a/godot-patches/01_godot_nir_goodies.patch b/godot-patches/01_godot_nir_goodies.patch index e0a17d9..a973143 100644 --- a/godot-patches/01_godot_nir_goodies.patch +++ b/godot-patches/01_godot_nir_goodies.patch @@ -718,14 +718,15 @@ index 245c5140f9..d6c9d06c30 100644 } 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: 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: diff --git a/godot-patches/02_Add_Curly_Braces_nir_to_dxil.c.patch b/godot-patches/02_Add_Curly_Braces_nir_to_dxil.c.patch deleted file mode 100644 index 504e79a..0000000 --- a/godot-patches/02_Add_Curly_Braces_nir_to_dxil.c.patch +++ /dev/null @@ -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: diff --git a/godot-tools/__pycache__/windows.cpython-310.pyc b/godot-tools/__pycache__/windows.cpython-310.pyc deleted file mode 100644 index d79c9e5ee4b9cb79c815c11aeef8419ca21cc877..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2369 zcmb7FTW=dh6yBTdwc|LKUc;p}uv*=A3WNIXinM7#+QIB-E@-eXG0)kgN#=sh2+0mLL_u7mHJ2B<@7Qwo_nlVg9yt)LZPzD3pDpvOz-xK7-^Lt0970NsMJUYw z7a-3GJQmua+iJGD-RR!B>mSAu&dO*?)6*91`Jvl!EYIDeHgz3l#U8fj9oKo9ID0*W zL&NB1DNf4jyWvxr%`IlhWvjGVw{Fi?%OuZDv8U%9b)qZ7_}AB;R8K2{@2D3E;n}4i z@Sb2pd(U(5HI1MfvfmVnL#4caSo&%g-jwZjeVgoV(BJ^&V!Q2t1YrU7@ti^&k5eayO98uQCf2S(tCL0Om))l<^V^SRVsJ&`&@=1-%LT^h;DlWGK-^Er5bq zR8Q3Dck-F9$MSR3hkTC6{y5Rdt!u&xQGvfLc|;06FZnx?pO*Yx$;b8ue1#jZnmOY= z`yaexdw9!Aon|Gad*q8VUttjUFDku__)vRrx1`ff*Ox;( z*{>FAG=ZbY4V$)}^5nAz3(bXjp0GOvWTal)T&dKX#m&-cyf$~A>#(Wwl*^if#>>zn zc(McHA2ufH-)>aO&1$8-`l#GoTC0`0S$kAnt5u6T_+>Jsjg4|;d97C2iW0MxRo04< zv%PS?@BoXcQfYa;xUxk}L=+jKbI_Dv_1S7&Ol3^l0w%q_R{JKl70o>|Wiu?aJg${W zTrchH@C1H)M2p+um^DTbz{+;BQY$X4SIS&zWY?-2>uXCJn}}tHk8G`;3Xw5GJa3@d zdb}*w4R_(e0u@aonk@7e<_ogB&)vs{=sMBmcXiX#(bzeyO}SRwj4qv1Qrnlc+bq_w zKQ}~H(fB!&Hjpl8TCGSgJetD>+kNVWqUTXuek@82x?hwVFa@BuVLow2W+7<-bF#4Q z-7OUSpwRP)v+w#2$&XOcv1GsEX4~-{YKIOt>gb|8S?qQl9}PODkA3%tp2Kw%mz!PB z4)+7vp`xjAvvb^JUAyl$(yhSXciTPcLL}}`#nKk|a3F1tA diff --git a/godot-tools/__pycache__/windows.cpython-311.pyc b/godot-tools/__pycache__/windows.cpython-311.pyc deleted file mode 100644 index 1f324b701cce593c37b50e326fba3170835e72f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4580 zcmb^!TTdI=dBz@_@nyh-BwPa%E(wGf6GI%Dq`MGfE*tD1Fpy@eQpaaZoY-S`W(=Dyh>N9^3?B)$L40biIn5< zne*Mh^UZg@`Q}TGb5bzgL>q-aauoGX0#t^@T)ZBK#d8W#h)z-W%6Ix64X`C;Nn7t( z)66}FCU|Sg7NrpLYwDgI*a2FH!?_|0e1p0~Vc0%j0yxVz38!{I>f#Q ze;mm9Ui@((_xI^R6g(p?qC0Z3uxdP-{H-Nf;FSjgA5MzXD||eY&L&fW#3w~r5n_nX zB>3>+a*+4(88P*Q7ZM2}t|Zq50Qr@qh%y`UlpidOClm;{V*-a=021$Z6{YLc04_ zCX-qQgR%Q50WzD(WEEK^Nyxt$4_^0yuq6AkVhs7_rOZQ!mh4;0pp4>$@T3H9*+~+8xN^M)SE)nioP@GaWZ>$obZst{R*qI>!do2X4*s=lZwiZ$KX4Z#>SAPVL7^ zYJutv&*1n#O>6XVY4IAw==593pQ$O|e4@RxwfKR%b~KuSyQRk7S`YZs>^XtnY39w6ku9{5EhN3o@$mm=OYOaM!CsC%SHy$w z=M9g^s@qugz^d1<*;KIzXT#_Z2z)$4$xin@1?hw5q;du2yqCaYKX42k(dc_ejTL!AZn5i#Z{+ON&cJu`?P@J+Mt2g3 zNaQH#OiYSD(Cv@M0;_>h-4;tDxVfSe3)7+K>cm2Drc4|0>sH{2>UBwZ)oeLs=m>Os z8gAkvy)pWu`OxHQI24_^Gr4+eHZrNRkvrkpNOtGjcp{ z_vMs?cMOPi!Qj-~#Pp&>jz^v$eS$>Z$$6_U93|5vOe;i7 zv0IpkfPI}IyUKeGv8;inBbazRZ}r|80Rt-=Qc@u;js$JLoUb#RoqWBy@PhU=U~fDC z%L;%KxfwkQIKMapfgcunsoa_HYLAR3Nve{HjNo1t7L{e2}(@$3AY-~f+9r28qNUr51VZbV#CN$=LOcr!|RsxHU zWnzuzd7~YX{KPbwNIxR~1!zVu@@%r;s^9#%=4$_znx<{e&za9$FM}#StntHT456=Y z-`MTnb9G}^cj0{hW^jj7-JRIoS>QZ7XSYAzo!R4hG1pr-f5D^`TF-4-H)pr%zq3;g zZkyYQt8AObwqdrdz`B0Ne#-7Nt8A;rwqmxmf@!Jp6oJS2sS|hkzy1h!ez@sW*>Q~> z$Lu)a1%*+CvW*f|=kOQZ4d1vs_S_vW62Rx~P~AhCdk7m>vEdYM z>d_i{OO%!K7d%bhc=$aJ|FZ98GxqSR=ZfaJf{m+q60PEdu)9J$=+oFf%=Q%_P`}Vz zoh8cR=qo`c5@{`25xb6-#G^V+pgb{RkmGY+cDc-vHMHh=_7`RHFg-Y!^KV>1R}szI7dXo5Xa)V z9&`0C)&qgx9Z}gXjqSpft7NA-h#0X`Z13D%|HF-!{d?_x-0t5wyL0xH_0`m0U7L0i z*8KK|CCcRp6k5A*cR+0ols8mp>BQ%+sV&#cjS|qWw)jo3qZ{{KS39l)$ZmxTZ9ML| zrnV7g`_}Ev+eM;mRBasv1VqPBHlntSn9|>`?5f&!wXDp{mfa&^sYEM;dq#2lRT8j( z#s)AOIGWN2GvX#>#B=BGoiCCvKHhOw)4{~z3jy4Bjo`;L&lvWMRq;Q7-4gr_&2s~L zZv6K^n$bp@)lync=Ax&!WVJNcm#mbd>063%IR8VY(&5SYW*Bft0dkPXVA7q7LHM*9 zBK4zOS&aJ7P{vk1>B^s8M$swP0MaKJx{SK;hP|22pj=A$K>7d(WX+;mTFA+vsV!L>-ttH0>!-)rp;@Y1m%v+3@XuqD&B# diff --git a/godot-tools/windows.py b/godot-tools/windows.py index 351dc57..7b9e498 100644 --- a/godot-tools/windows.py +++ b/godot-tools/windows.py @@ -23,8 +23,13 @@ def generate(env): if not env["use_mingw"] and msvc.exists(env): if env["arch"] == "x86_64": 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": env["TARGET_ARCH"] = "x86" + env["is_msvc"] = True # MSVC, linker, and archiver. @@ -63,7 +68,15 @@ def generate(env): else: env["use_mingw"] = True # 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"]: env["CXX"] = prefix + "-w64-mingw32-clang" env["CC"] = prefix + "-w64-mingw32-clang++" diff --git a/mesa b/mesa index 9085c9d..52ab558 160000 --- a/mesa +++ b/mesa @@ -1 +1 @@ -Subproject commit 9085c9d43e37c643ee9c9fb01b6184fa7c60bffd +Subproject commit 52ab5584b870be041b93f702693ea3f5665df860