diff options
author | Tapani Pälli <tapani.palli@intel.com> | 2023-05-03 07:13:07 +0300 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2023-05-12 06:59:34 +0000 |
commit | b0b6811b9bc7af16a180591cb7ed54a1205755ac (patch) | |
tree | aa03637c8edd83b1c8542d396a427efe13d33780 /src/intel | |
parent | 088e25216f4f58203fc5145888c6ea3c73fe8624 (diff) | |
download | mesa-b0b6811b9bc7af16a180591cb7ed54a1205755ac.tar.gz |
anv: handle missing astc for gfx125 in CreateImageView
Cc: mesa-stable
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22818>
Diffstat (limited to 'src/intel')
-rw-r--r-- | src/intel/vulkan/anv_device.c | 4 | ||||
-rw-r--r-- | src/intel/vulkan/layers/anv_android_layer.c | 46 | ||||
-rw-r--r-- | src/intel/vulkan/meson.build | 4 |
3 files changed, 53 insertions, 1 deletions
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 61b2509df00..ad95e5932a1 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -2965,6 +2965,10 @@ VkResult anv_CreateDevice( vk_device_dispatch_table_from_entrypoints(&dispatch_table, &doom64_device_entrypoints, true); override_initial_entrypoints = false; } +#ifdef ANDROID + vk_device_dispatch_table_from_entrypoints(&dispatch_table, &android_device_entrypoints, true); + override_initial_entrypoints = false; +#endif vk_device_dispatch_table_from_entrypoints(&dispatch_table, anv_genX(&physical_device->info, device_entrypoints), override_initial_entrypoints); diff --git a/src/intel/vulkan/layers/anv_android_layer.c b/src/intel/vulkan/layers/anv_android_layer.c new file mode 100644 index 00000000000..e36eb820ab6 --- /dev/null +++ b/src/intel/vulkan/layers/anv_android_layer.c @@ -0,0 +1,46 @@ +/* + * Copyright © 2023 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "anv_private.h" + +VKAPI_ATTR VkResult VKAPI_CALL +android_CreateImageView(VkDevice _device, + const VkImageViewCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkImageView *pView) +{ + ANV_FROM_HANDLE(anv_device, device, _device); + const struct util_format_description *fmt = + vk_format_description(pCreateInfo->format); + + /* Throw error in case application tries to create ASTC view on gfx125. + * This is done to avoid gpu hang that can result in using the unsupported + * format. + */ + if (fmt && fmt->layout == UTIL_FORMAT_LAYOUT_ASTC && + device->info->verx10 >= 125) { + return vk_errorf(device, VK_ERROR_OUT_OF_HOST_MEMORY, + "ASTC format not supported (%s).", __func__); + } + return anv_CreateImageView(_device, pCreateInfo, pAllocator, pView); +} diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 9790515c16c..e0de5bfa84e 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -42,7 +42,8 @@ anv_entrypoints = custom_target( '--device-prefix', 'gfx12', '--device-prefix', 'gfx125', '--device-prefix', 'doom64', - '--device-prefix', 'hitman3' + '--device-prefix', 'hitman3', + '--device-prefix', 'android' ], depend_files : vk_entrypoints_gen_depend_files, ) @@ -138,6 +139,7 @@ libanv_files = files( 'i915/anv_kmd_backend.c', 'layers/anv_doom64.c', 'layers/anv_hitman3.c', + 'layers/anv_android_layer.c', 'xe/anv_batch_chain.c', 'xe/anv_batch_chain.h', 'xe/anv_kmd_backend.c', |