Skip to content

wsi: honor blit buffer memory requirements for TT3 on PowerVR #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
butilly wants to merge 1 commit into
base: wrapper-25
Choose a base branch
from
Open

wsi: honor blit buffer memory requirements for TT3 on PowerVR #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/vulkan/wsi/wsi_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1954,7 +1954,11 @@ wsi_create_buffer_blit_context(const struct wsi_swapchain *chain,

VkMemoryRequirements reqs;
wsi->GetBufferMemoryRequirements(chain->device, image->blit.buffer, &reqs);
assert(reqs.size <= info->linear_size);
/* The driver may require padding beyond the linear pixel data. Use the
* actual buffer requirements for both device memory and imported SHM,
* without changing the image stride or the copy extent.
*/
const VkDeviceSize allocation_size = MAX2(reqs.size, info->linear_size);

struct wsi_memory_allocate_info memory_wsi_info = {
.sType = VK_STRUCTURE_TYPE_WSI_MEMORY_ALLOCATE_INFO_MESA,
Expand All @@ -1971,14 +1975,14 @@ wsi_create_buffer_blit_context(const struct wsi_swapchain *chain,
VkMemoryAllocateInfo buf_mem_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.pNext = &buf_mem_dedicated_info,
.allocationSize = info->linear_size,
.allocationSize = allocation_size,
.memoryTypeIndex =
info->select_blit_dst_memory_type(wsi, reqs.memoryTypeBits),
};

void *sw_host_ptr = NULL;
if (info->alloc_shm)
sw_host_ptr = info->alloc_shm(image, info->linear_size);
sw_host_ptr = info->alloc_shm(image, allocation_size);

VkExportMemoryAllocateInfo memory_export_info;
VkImportMemoryHostPointerInfoEXT host_ptr_info;
Expand Down Expand Up @@ -2029,7 +2033,7 @@ wsi_create_buffer_blit_context(const struct wsi_swapchain *chain,
return result;

image->num_planes = 1;
image->sizes[0] = info->linear_size;
image->sizes[0] = allocation_size;
image->row_pitches[0] = info->linear_stride;
image->offsets[0] = 0;

Expand Down
Loading