OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gfxstream: Remove VkImage from functable handle translation

Browse Source 
Not required for any Mesa object backings.
TODO: Investigate why VkBuffer still required (and crashing without
translation)

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
This commit is contained in:
Aaron Ruby
2024-04-26 17:12:55 -04:00
committed by Marge Bot
parent f667ed01e7
commit 24cb362a9c
3 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gfxstream/codegen/scripts/cereal/functable.py
View File

@@ -137,9 +137,8 @@ HANDLES_TRANSLATE = {
"VkCommandBuffer", "VkCommandBuffer",
"VkFence", "VkFence",
"VkSemaphore", "VkSemaphore",
# TODO: What part of WSI needs Mesa object backings for VkImage/VkBuffer? # TODO: Still need this translation to avoid descriptorSets crash
"VkBuffer", "VkBuffer",
"VkImage",
} }
# Types that have a corresponding method for transforming # Types that have a corresponding method for transforming

4
src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
View File

@@ -654,10 +654,6 @@ VkResult gfxstream_vk_AllocateMemory(VkDevice device, const VkMemoryAllocateInfo
VK_FROM_HANDLE(gfxstream_vk_buffer, gfxstream_buffer, dedicatedAllocInfoPtr->buffer); VK_FROM_HANDLE(gfxstream_vk_buffer, gfxstream_buffer, dedicatedAllocInfoPtr->buffer);
dedicatedAllocInfoPtr->buffer = gfxstream_buffer->internal_object; dedicatedAllocInfoPtr->buffer = gfxstream_buffer->internal_object;
} }
if (dedicatedAllocInfoPtr->image) {
VK_FROM_HANDLE(gfxstream_vk_image, gfxstream_image, dedicatedAllocInfoPtr->image);
dedicatedAllocInfoPtr->image = gfxstream_image->internal_object;
}
} }
{ {
auto vkEnc = gfxstream::vk::ResourceTracker::getThreadLocalEncoder(); auto vkEnc = gfxstream::vk::ResourceTracker::getThreadLocalEncoder();

6
src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.h
View File

@@ -101,11 +101,6 @@ struct gfxstream_vk_command_buffer {
VkCommandBuffer internal_object; VkCommandBuffer internal_object;
}; };
struct gfxstream_vk_image {
struct vk_image vk;
VkImage internal_object;
};
struct gfxstream_vk_fence { struct gfxstream_vk_fence {
struct vk_fence vk; struct vk_fence vk;
VkFence internal_object; VkFence internal_object;
@@ -127,7 +122,6 @@ VK_DEFINE_HANDLE_CASTS(gfxstream_vk_queue, vk.base, VkQueue, VK_OBJECT_TYPE_QUEU
VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_command_pool, vk.base, VkCommandPool, VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_command_pool, vk.base, VkCommandPool,
VK_OBJECT_TYPE_COMMAND_POOL) VK_OBJECT_TYPE_COMMAND_POOL)
VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER) VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER)
VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_image, vk.base, VkImage, VK_OBJECT_TYPE_IMAGE)
VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_fence, vk.base, VkFence, VK_OBJECT_TYPE_FENCE) VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_fence, vk.base, VkFence, VK_OBJECT_TYPE_FENCE)
VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_semaphore, vk.base, VkSemaphore, VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_semaphore, vk.base, VkSemaphore,
VK_OBJECT_TYPE_SEMAPHORE) VK_OBJECT_TYPE_SEMAPHORE)