builders/mesa-vulkan-amd-sh-a74ebffc6a6193445231563cdaa4494933b6c281/contrib/radv_meta_copy.c.patch

   1 --- a/src/amd/vulkan/meta/radv_meta_copy.c
   2 +++ b/src/amd/vulkan/meta/radv_meta_copy.c
   3 @@ -262,17 +262,18 @@ radv_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer, const VkCopyBufferToIm
   4
   5        const enum util_format_layout format_layout = vk_format_description(dst_image->vk.format)->layout;
   6        for (unsigned r = 0; r < pCopyBufferToImageInfo->regionCount; r++) {
   7 -         if (format_layout == UTIL_FORMAT_LAYOUT_ASTC) {
   8 -            radv_meta_decode_astc(cmd_buffer, dst_image, pCopyBufferToImageInfo->dstImageLayout,
   9 -                                  &pCopyBufferToImageInfo->pRegions[r].imageSubresource,
  10 -                                  pCopyBufferToImageInfo->pRegions[r].imageOffset,
  11 -                                  pCopyBufferToImageInfo->pRegions[r].imageExtent);
  12 -         } else {
  13 +       // XXX: current astc work is omega trash
  14 +         //if (format_layout == UTIL_FORMAT_LAYOUT_ASTC) {
  15 +         //   radv_meta_decode_astc(cmd_buffer, dst_image, pCopyBufferToImageInfo->dstImageLayout,
  16 +         //                         &pCopyBufferToImageInfo->pRegions[r].imageSubresource,
  17 +         //                         pCopyBufferToImageInfo->pRegions[r].imageOffset,
  18 +         //                         pCopyBufferToImageInfo->pRegions[r].imageExtent);
  19 +         //} else {
  20              radv_meta_decode_etc(cmd_buffer, dst_image, pCopyBufferToImageInfo->dstImageLayout,
  21                                   &pCopyBufferToImageInfo->pRegions[r].imageSubresource,
  22                                   pCopyBufferToImageInfo->pRegions[r].imageOffset,
  23                                   pCopyBufferToImageInfo->pRegions[r].imageExtent);
  24 -         }
  25 +         //}
  26        }
  27     }
  28  }
  29 @@ -613,15 +614,16 @@ radv_CmdCopyImage2(VkCommandBuffer commandBuffer, const VkCopyImageInfo2 *pCopyI
  30              dst_extent.height = dst_extent.height / vk_format_get_blockheight(src_image->vk.format) *
  31                                  vk_format_get_blockheight(dst_image->vk.format);
  32           }
  33 -         if (format_layout == UTIL_FORMAT_LAYOUT_ASTC) {
  34 -            radv_meta_decode_astc(cmd_buffer, dst_image, pCopyImageInfo->dstImageLayout,
  35 -                                  &pCopyImageInfo->pRegions[r].dstSubresource, pCopyImageInfo->pRegions[r].dstOffset,
  36 -                                  dst_extent);
  37 -         } else {
  38 +       // XXX: current astc work is omega trash
  39 +         //if (format_layout == UTIL_FORMAT_LAYOUT_ASTC) {
  40 +         //   radv_meta_decode_astc(cmd_buffer, dst_image, pCopyImageInfo->dstImageLayout,
  41 +         //                         &pCopyImageInfo->pRegions[r].dstSubresource, pCopyImageInfo->pRegions[r].dstOffset,
  42 +         //                         dst_extent);
  43 +         //} else {
  44              radv_meta_decode_etc(cmd_buffer, dst_image, pCopyImageInfo->dstImageLayout,
  45                                   &pCopyImageInfo->pRegions[r].dstSubresource, pCopyImageInfo->pRegions[r].dstOffset,
  46                                   dst_extent);
  47 -         }
  48 +         //}
  49        }
  50     }
  51  }