builders/mesa-vulkan-amd-sh-8368a972943d5265b22eab86aa17c9a3cfe3406b/contrib/radv_meta.c.patch

   1 --- a/src/amd/vulkan/meta/radv_meta.c
   2 +++ b/src/amd/vulkan/meta/radv_meta.c
   3 @@ -528,9 +528,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 C: (spir-v|gcn/rdna assembly
  13 +//       with simple and plain C 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);
  21 @@ -538,35 +543,52 @@ 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 -
  32 -      /* FIXME: Acceleration structure builds hang when the build shaders are compiled with LLVM.
  33 -       * Work around it by forcing ACO for now.
  34 -       */
  35 -      bool use_llvm = device->physical_device->use_llvm;
  36 -      if (loaded_cache || use_llvm) {
  37 -         device->physical_device->use_llvm = false;
  38 -         result = radv_device_init_accel_struct_build_state(device);
  39 -         device->physical_device->use_llvm = use_llvm;
  40 -
  41 -         if (result != VK_SUCCESS)
  42 -            goto fail_accel_struct;
  43 -      }
  44 -   }
  45 +//  XXX: insanely toxic compute based stuff pulling that
  46 +//       disgusting khronos glslang. Should be independent
  47 +//       of glslang and in simple C: (spir-v|gcn/rdna assembly
  48 +//       with simple and plain C written "assemblers").
  49 +//       blame: Konstantin Seurer
  50 +//   if (device->vk.enabled_extensions.KHR_acceleration_structure) {
  51 +//      if (device->vk.enabled_features.nullDescriptor) {
  52 +//         result = radv_device_init_null_accel_struct(device);
  53 +//         if (result != VK_SUCCESS)
  54 +//            goto fail_accel_struct;
  55 +//      }
  56 +//
  57 +//      /* FIXME: Acceleration structure builds hang when the build shaders are compiled with LLVM.
  58 +//       * Work around it by forcing ACO for now.
  59 +//       */
  60 +//      bool use_llvm = device->physical_device->use_llvm;
  61 +//      if (loaded_cache || use_llvm) {
  62 +//         device->physical_device->use_llvm = false;
  63 +//         result = radv_device_init_accel_struct_build_state(device);
  64 +//         device->physical_device->use_llvm = use_llvm;
  65 +//
  66 +//         if (result != VK_SUCCESS)
  67 +//            goto fail_accel_struct;
  68 +//      }
  69 +//   }
  70
  71     return VK_SUCCESS;
  72
  73 -fail_accel_struct:
  74 -   radv_device_finish_accel_struct_build_state(device);
  75 +//  XXX: insanely toxic compute based stuff pulling that
  76 +//       disgusting khronos glslang. Should be independent
  77 +//       of glslang and in simple C: (spir-v|gcn/rdna assembly
  78 +//       with simple and plain C written "assemblers").
  79 +//       blame: Konstantin Seurer
  80 +//fail_accel_struct:
  81 +//   radv_device_finish_accel_struct_build_state(device);
  82  fail_dgc:
  83     radv_device_finish_dgc_prepare_state(device);
  84 -fail_astc_decode:
  85 -   radv_device_finish_meta_astc_decode_state(device);
  86 +//  XXX: insanely toxic compute based stuff pulling that
  87 +//       disgusting khronos glslang. Should be independent
  88 +//       of glslang and in simple C: (spir-v|gcn/rdna assembly
  89 +//       with simple and plain C written "assemblers").
  90 +//       blame: some trash.
  91 +//fail_astc_decode:
  92 +//   radv_device_finish_meta_astc_decode_state(device);
  93 +//fail_astc_decode:
  94 +//   radv_device_finish_meta_astc_decode_state(device);
  95  fail_etc_decode:
  96     radv_device_finish_meta_etc_decode_state(device);
  97  fail_fmask_copy:
  98 @@ -606,8 +628,18 @@ radv_device_finish_meta(struct radv_device *device)
  99  {
 100     radv_device_finish_dgc_prepare_state(device);
 101     radv_device_finish_meta_etc_decode_state(device);
 102 -   radv_device_finish_meta_astc_decode_state(device);
 103 -   radv_device_finish_accel_struct_build_state(device);
 104 +//  XXX: insanely toxic compute based stuff pulling that
 105 +//       disgusting khronos glslang. Should be independent
 106 +//       of glslang and in simple C: (spir-v|gcn/rdna assembly
 107 +//       with simple and plain C written "assemblers").
 108 +//       blame: some trash.
 109 +//   radv_device_finish_meta_astc_decode_state(device);
 110 +//  XXX: insanely toxic compute based stuff pulling that
 111 +//       disgusting khronos glslang. Should be independent
 112 +//       of glslang and in simple C: (spir-v|gcn/rdna assembly
 113 +//       with simple and plain C written "assemblers").
 114 +//       blame: Konstantin Seurer
 115 +//   radv_device_finish_accel_struct_build_state(device);
 116     radv_device_finish_meta_clear_state(device);
 117     radv_device_finish_meta_resolve_state(device);
 118     radv_device_finish_meta_blit_state(device);