nvk: Don't zero imported memory
This fixes eg.
dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a8b8g8r8_uint_pack32
with NVK_DEBUG=zero_memory
Fixes: 0399999dec ("nvk: Support dma-buf import")
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33947>
This commit is contained in:
@@ -157,7 +157,8 @@ nvk_AllocateMemory(VkDevice device,
|
||||
if (!mem)
|
||||
return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
|
||||
|
||||
if (fd_info && fd_info->handleType) {
|
||||
const bool is_import = fd_info && fd_info->handleType;
|
||||
if (is_import) {
|
||||
assert(fd_info->handleType ==
|
||||
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT ||
|
||||
fd_info->handleType ==
|
||||
@@ -188,7 +189,7 @@ nvk_AllocateMemory(VkDevice device,
|
||||
goto fail_alloc;
|
||||
}
|
||||
|
||||
if (pdev->debug_flags & NVK_DEBUG_ZERO_MEMORY) {
|
||||
if ((pdev->debug_flags & NVK_DEBUG_ZERO_MEMORY) && !is_import) {
|
||||
if (type->propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
|
||||
void *map;
|
||||
result = nvkmd_mem_map(mem->mem, &dev->vk.base,
|
||||
|
||||
Reference in New Issue
Block a user