fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: merge driver internal bits

Browse source 
no reason for hk and vk_meta to diverge here.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31466>
This commit is contained in:
Alyssa Rosenzweig 2024-10-01 13:54:46 -04:00 • committed by Marge Bot
parent 07470d19dd
commit 1a2827e401
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/asahi/vulkan/hk_cmd_clear.c
View file

@ -70,7 +70,7 @@ clear_image(struct hk_cmd_buffer *cmd, struct hk_image *image,
};
const VkImageViewCreateInfo view_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.flags = VK_IMAGE_VIEW_CREATE_INTERNAL_MESA,
.flags = VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA,
.pNext = &view_usage_info,
.image = hk_image_to_handle(image),
.viewType = render_view_type(image->vk.image_type, layer_count),

8
src/asahi/vulkan/hk_cmd_meta.c
View file

@ -815,7 +815,7 @@ hk_meta_copy_image_to_buffer2(struct vk_command_buffer *cmd,
};
const VkImageViewCreateInfo src_view_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.flags = VK_IMAGE_VIEW_CREATE_INTERNAL_MESA,
.flags = VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA,
.pNext = &src_view_usage,
.image = pCopyBufferInfo->srcImage,
.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY,
@ -1019,7 +1019,7 @@ hk_meta_copy_buffer_to_image2(struct vk_command_buffer *cmd,
};
const VkImageViewCreateInfo dst_view_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.flags = VK_IMAGE_VIEW_CREATE_INTERNAL_MESA,
.flags = VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA,
.pNext = &dst_view_usage,
.image = info->dstImage,
.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY,
@ -1170,7 +1170,7 @@ hk_meta_copy_image2(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
};
const VkImageViewCreateInfo src_view_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.flags = VK_IMAGE_VIEW_CREATE_INTERNAL_MESA,
.flags = VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA,
.pNext = &src_view_usage,
.image = info->srcImage,
.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY,
@ -1208,7 +1208,7 @@ hk_meta_copy_image2(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
};
const VkImageViewCreateInfo dst_view_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.flags = VK_IMAGE_VIEW_CREATE_INTERNAL_MESA,
.flags = VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA,
.pNext = &dst_view_usage,
.image = info->dstImage,
.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY,

3
src/asahi/vulkan/hk_image_view.c
View file

@ -640,7 +640,8 @@ hk_CreateImageView(VkDevice _device, const VkImageViewCreateInfo *pCreateInfo,
return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
result = hk_image_view_init(
dev, view, pCreateInfo->flags & VK_IMAGE_VIEW_CREATE_INTERNAL_MESA,
dev, view,
pCreateInfo->flags & VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA,
pCreateInfo);
if (result != VK_SUCCESS) {
hk_DestroyImageView(_device, hk_image_view_to_handle(view), pAllocator);

4
src/vulkan/runtime/vk_meta.h
View file

@ -47,7 +47,7 @@ struct vk_meta_rect {
};
#define VK_PRIMITIVE_TOPOLOGY_META_RECT_LIST_MESA (VkPrimitiveTopology)11
#define VK_IMAGE_VIEW_CREATE_INTERNAL_MESA (VkImageViewCreateFlagBits)0x40000000
#define VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA (VkImageViewCreateFlagBits)0x80000000
struct vk_meta_copy_image_properties {
union {
@ -275,8 +275,6 @@ VkResult vk_meta_create_buffer_view(struct vk_command_buffer *cmd,
const VkBufferViewCreateInfo *info,
VkBufferView *buffer_view_out);
#define VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA 0x80000000
VkResult vk_meta_create_image_view(struct vk_command_buffer *cmd,
struct vk_meta_device *meta,
const VkImageViewCreateInfo *info,