/builders/mesa-vulkan-amd-sh-964323fe97bb0d755c3edf1fbdbaa5ffeaa217ea/contrib/radv_meta.c.patch (ac6777c15d4b2ff3bf4351e582837fd0a5ea0c29) (3347 bytes) (mode 100644) (type blob)
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -492,31 +492,41 @@ radv_device_init_meta(struct radv_device *device)
goto fail_dgc;
}
- if (device->vk.enabled_extensions.KHR_acceleration_structure) {
- if (device->vk.enabled_features.nullDescriptor) {
- result = radv_device_init_null_accel_struct(device);
- if (result != VK_SUCCESS)
- goto fail_accel_struct;
- }
-
- /* FIXME: Acceleration structure builds hang when the build shaders are compiled with LLVM.
- * Work around it by forcing ACO for now.
- */
- bool use_llvm = device->physical_device->use_llvm;
- if (loaded_cache || use_llvm) {
- device->physical_device->use_llvm = false;
- result = radv_device_init_accel_struct_build_state(device);
- device->physical_device->use_llvm = use_llvm;
-
- if (result != VK_SUCCESS)
- goto fail_accel_struct;
- }
- }
+// XXX: insanely toxic compute based stuff pulling that
+// disgusting khronos glslang. Should be independent
+// of glslang and in simple C: (spir-v|gcn/rdna assembly
+// with simple and plain C written "assemblers").
+// blame: Konstantin Seurer
+// if (device->vk.enabled_extensions.KHR_acceleration_structure) {
+// if (device->vk.enabled_features.nullDescriptor) {
+// result = radv_device_init_null_accel_struct(device);
+// if (result != VK_SUCCESS)
+// goto fail_accel_struct;
+// }
+//
+// /* FIXME: Acceleration structure builds hang when the build shaders are compiled with LLVM.
+// * Work around it by forcing ACO for now.
+// */
+// bool use_llvm = device->physical_device->use_llvm;
+// if (loaded_cache || use_llvm) {
+// device->physical_device->use_llvm = false;
+// result = radv_device_init_accel_struct_build_state(device);
+// device->physical_device->use_llvm = use_llvm;
+//
+// if (result != VK_SUCCESS)
+// goto fail_accel_struct;
+// }
+// }
return VK_SUCCESS;
-fail_accel_struct:
- radv_device_finish_accel_struct_build_state(device);
+// XXX: insanely toxic compute based stuff pulling that
+// disgusting khronos glslang. Should be independent
+// of glslang and in simple C: (spir-v|gcn/rdna assembly
+// with simple and plain C written "assemblers").
+// blame: Konstantin Seurer
+//fail_accel_struct:
+// radv_device_finish_accel_struct_build_state(device);
fail_dgc:
radv_device_finish_dgc_prepare_state(device);
fail_etc_decode:
@@ -558,7 +568,12 @@ radv_device_finish_meta(struct radv_device *device)
{
radv_device_finish_dgc_prepare_state(device);
radv_device_finish_meta_etc_decode_state(device);
- radv_device_finish_accel_struct_build_state(device);
+// XXX: insanely toxic compute based stuff pulling that
+// disgusting khronos glslang. Should be independent
+// of glslang and in simple C: (spir-v|gcn/rdna assembly
+// with simple and plain C written "assemblers").
+// blame: Konstantin Seurer
+// radv_device_finish_accel_struct_build_state(device);
radv_device_finish_meta_clear_state(device);
radv_device_finish_meta_resolve_state(device);
radv_device_finish_meta_blit_state(device);
Mode |
Type |
Size |
Ref |
File |
100644 |
blob |
5 |
8eba6c8dd4dcaf6166bd22285ed34625f38a84ff |
.gitignore |
100755 |
blob |
1587 |
57fa4264b9ee0ae0a6f678f2527a05d3b22dda78 |
00-bootstrap-build.sh |
100755 |
blob |
848 |
a30f443bf405d56682efe3b4c5d3a19d5f7eb45d |
01-re-bootstrap-build.sh |
100644 |
blob |
2142 |
f19c2d6b293244bb11a3f74ee77c10675cadc7d6 |
INSTALL |
100644 |
blob |
30 |
c9b735fa1332286f4b3f5f81fa10527fd7506b6e |
LICENSE |
040000 |
tree |
- |
9e37c60a5065a46b8f3d59beb4662352b513990c |
builders |
100644 |
blob |
1773 |
ef1551089a803bde37e36edc8d61bb819d06f793 |
conf.bootstrap.sh |
100644 |
blob |
479 |
8cc15efe46965ac7750fe304460f5a2b0aa4201c |
conf.sh |
040000 |
tree |
- |
7ea5e4483abba8ec1bb14f89a740d3e5acee379e |
files |
100755 |
blob |
333 |
06859f922e41c1e691c72ada1be3f981ef05f602 |
pkg-build |
100644 |
blob |
22800641 |
e9e6291054c857401f6835c728f31541dae4311e |
steam.tar.bz2 |
100644 |
blob |
173 |
2047af328b22f9d146585cd9e759edbc18122250 |
utils.sh |
040000 |
tree |
- |
d221a7a33697c4f163c894bf9077c5727a3ab866 |
x64 |
040000 |
tree |
- |
b7a22de7f5cbd97650dd45412ef7d4246e395eb8 |
x86 |
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"
Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/sylware/nyanlinux
Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/sylware/nyanlinux
Clone this repository using git:
git clone git://git.rocketgit.com/user/sylware/nyanlinux
You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a
merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main