builders/mesa-vulkan-amd-sh-665eae51efef3e836517a7588caddbb902def259/contrib/radv_meta.c.patch

   1 --- a/src/amd/vulkan/meta/radv_meta.c
   2 +++ b/src/amd/vulkan/meta/radv_meta.c
   3 @@ -507,9 +507,14 @@ radv_device_init_meta(struct radv_device *device)
   4     if (result != VK_SUCCESS)
   5        goto fail_etc_decode;
   6
   7 -   result = radv_device_init_meta_astc_decode_state(device, on_demand);
   8 -   if (result != VK_SUCCESS)
   9 -      goto fail_astc_decode;
  10 +//  XXX: insanely toxic compute based stuff pulling that
  11 +//       disgusting khronos glslang. Should be independent
  12 +//       of glslang and in simple C99: (spir-v|gcn/rdna assembly
  13 +//       with simple and plain C99 written "assemblers").
  14 +//       blame: some trash.
  15 +//   result = radv_device_init_meta_astc_decode_state(device, on_demand);
  16 +//   if (result != VK_SUCCESS)
  17 +//      goto fail_astc_decode;
  18
  19     if (radv_uses_device_generated_commands(device)) {
  20        result = radv_device_init_dgc_prepare_state(device, on_demand);
  21 @@ -517,35 +522,40 @@ radv_device_init_meta(struct radv_device *device)
  22           goto fail_dgc;
  23     }
  24
  25 -   if (device->vk.enabled_extensions.KHR_acceleration_structure) {
  26 -      if (device->vk.enabled_features.nullDescriptor) {
  27 -         result = radv_device_init_null_accel_struct(device);
  28 -         if (result != VK_SUCCESS)
  29 -            goto fail_accel_struct;
  30 -      }
  31 +//  XXX: insanely toxic compute based stuff pulling that
  32 +//       disgusting khronos glslang. Should be independent
  33 +//       of glslang and in simple C99: (spir-v|gcn/rdna assembly
  34 +//       with simple and plain C99 written "assemblers").
  35 +//       blame: Konstantin Seurer
  36 +//   if (device->vk.enabled_extensions.KHR_acceleration_structure) {
  37 +//      if (device->vk.enabled_features.nullDescriptor) {
  38 +//         result = radv_device_init_null_accel_struct(device);
  39 +//         if (result != VK_SUCCESS)
  40 +//            goto fail_accel_struct;
  41 +//      }
  42
  43        /* FIXME: Acceleration structure builds hang when the build shaders are compiled with LLVM.
  44         * Work around it by forcing ACO for now.
  45         */
  46 -      bool use_llvm = pdev->use_llvm;
  47 -      if (loaded_cache || use_llvm) {
  48 -         pdev->use_llvm = false;
  49 -         result = radv_device_init_accel_struct_build_state(device);
  50 -         pdev->use_llvm = use_llvm;
  51 -
  52 -         if (result != VK_SUCCESS)
  53 -            goto fail_accel_struct;
  54 -      }
  55 -   }
  56 +//      bool use_llvm = pdev->use_llvm;
  57 +//      if (loaded_cache || use_llvm) {
  58 +//         pdev->use_llvm = false;
  59 +//         result = radv_device_init_accel_struct_build_state(device);
  60 +//         pdev->use_llvm = use_llvm;
  61 +//
  62 +//         if (result != VK_SUCCESS)
  63 +//            goto fail_accel_struct;
  64 +//      }
  65 +//   }
  66
  67     return VK_SUCCESS;
  68
  69 -fail_accel_struct:
  70 -   radv_device_finish_accel_struct_build_state(device);
  71 +//fail_accel_struct:
  72 +//   radv_device_finish_accel_struct_build_state(device);
  73  fail_dgc:
  74     radv_device_finish_dgc_prepare_state(device);
  75 -fail_astc_decode:
  76 -   radv_device_finish_meta_astc_decode_state(device);
  77 +//fail_astc_decode:
  78 +//   radv_device_finish_meta_astc_decode_state(device);
  79  fail_etc_decode:
  80     radv_device_finish_meta_etc_decode_state(device);
  81  fail_fmask_copy:
  82 @@ -585,8 +595,8 @@ radv_device_finish_meta(struct radv_device *device)
  83  {
  84     radv_device_finish_dgc_prepare_state(device);
  85     radv_device_finish_meta_etc_decode_state(device);
  86 -   radv_device_finish_meta_astc_decode_state(device);
  87 -   radv_device_finish_accel_struct_build_state(device);
  88 +//   radv_device_finish_meta_astc_decode_state(device);
  89 +//   radv_device_finish_accel_struct_build_state(device);
  90     radv_device_finish_meta_clear_state(device);
  91     radv_device_finish_meta_resolve_state(device);
  92     radv_device_finish_meta_blit_state(device);