Skip to content

wrapper: honor BCn CPU staging memory requirements and flush uploads #61

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 2 commits into
base: wrapper-25
Choose a base branch
from
Open

wrapper: honor BCn CPU staging memory requirements and flush uploads #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6098a52
wsi: honor blit buffer memory requirements for TT3 on PowerVR
butilly Nov 5, 2026
386415d
wrapper: honor BCn CPU staging memory requirements and flush uploads
butilly Nov 8, 2026
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
82 changes: 68 additions & 14 deletions src/vulkan/wrapper/wrapper_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5370,6 +5370,8 @@ wrapper_bcn_staging_create(struct wrapper_device *device, VkDeviceSize upload_si
VkResult res;
struct wrapper_buffer *staging_wb = vk_object_zalloc(&device->vk,
&device->vk.alloc, sizeof(struct wrapper_buffer), VK_OBJECT_TYPE_BUFFER);
if (!staging_wb)
return NULL;

VkBufferCreateInfo buffer_create_info = {
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
Expand All @@ -5384,61 +5386,112 @@ wrapper_bcn_staging_create(struct wrapper_device *device, VkDeviceSize upload_si

if (res != VK_SUCCESS) {
WRAPPER_LOG(error, "Failed to create staging buffer, res %d", res);
return NULL;
goto fail;
}

/* The CPU fallback is used when a per-format GPU decoder cannot be built.
* Its upload buffers still have to obey the base driver's requirements. */
VkMemoryRequirements requirements;
device->dispatch_table.GetBufferMemoryRequirements(device->dispatch_handle,
staging_wb->dispatch_handle, &requirements);
const VkPhysicalDeviceMemoryProperties *props = &device->physical->memory_properties;
uint32_t memory_type = UINT32_MAX;
for (uint32_t i = 0; i < props->memoryTypeCount; i++) {
VkMemoryPropertyFlags flags = props->memoryTypes[i].propertyFlags;
if (!(requirements.memoryTypeBits & (1u << i)) ||
!(flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))
continue;
if (memory_type == UINT32_MAX)
memory_type = i;
if (flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) {
memory_type = i;
break;
}
}
if (memory_type == UINT32_MAX) {
WRAPPER_LOG(error, "BCn: no compatible host-visible staging memory");
goto fail;
}

VkMemoryAllocateInfo allocate_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.allocationSize = upload_size,
.memoryTypeIndex = wrapper_select_device_memory_type(device,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT),
.allocationSize = requirements.size,
.memoryTypeIndex = memory_type,
};

res = device->dispatch_table.AllocateMemory(device->dispatch_handle,
&allocate_info, NULL, &staging_wb->memory);

if (res != VK_SUCCESS) {
WRAPPER_LOG(error, "Failed to allocate staging buffer memory, res %d", res);
return NULL;
goto fail;
}

res = device->dispatch_table.BindBufferMemory(device->dispatch_handle,
staging_wb->dispatch_handle, staging_wb->memory, 0);

if (res != VK_SUCCESS) {
WRAPPER_LOG(error, "Failed to bind staging buffer memory, res %d", res);
return NULL;
goto fail;
}

res = device->dispatch_table.MapMemory(device->dispatch_handle,
staging_wb->memory, 0, upload_size, 0, &staging_wb->mapped_address);
staging_wb->memory, 0, VK_WHOLE_SIZE, 0, &staging_wb->mapped_address);

if (res != VK_SUCCESS) {
WRAPPER_LOG(error, "Failed to map staging buffer memory, res %d", res);
return NULL;
goto fail;
}

return staging_wb;

fail:
if (staging_wb->dispatch_handle)
device->dispatch_table.DestroyBuffer(device->dispatch_handle,
staging_wb->dispatch_handle, NULL);
if (staging_wb->memory)
device->dispatch_table.FreeMemory(device->dispatch_handle, staging_wb->memory, NULL);
vk_object_free(&device->vk, &device->vk.alloc, staging_wb);
return NULL;
}

/* Copy a tightly packed staging upload into the image; freed with the command
* buffer. */
static void
static bool
wrapper_bcn_staging_submit(struct wrapper_command_buffer *wcb,
struct wrapper_device *device,
struct wrapper_buffer *staging_wb, VkImage dstImage,
VkImageLayout dstLayout, VkBufferImageCopy copy_region)
{
staging_wb->wcb = wcb;
staging_wb->device = device;
list_addtail(&staging_wb->link, &wcb->bcn_transients);

/* Flushing is harmless for coherent memory and required otherwise. Mapping
* and flushing the whole allocation also covers nonCoherentAtomSize padding. */
VkMappedMemoryRange range = {
.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE,
.memory = staging_wb->memory,
.offset = 0,
.size = VK_WHOLE_SIZE,
};
VkResult res = device->dispatch_table.FlushMappedMemoryRanges(device->dispatch_handle,
1, &range);
device->dispatch_table.UnmapMemory(device->dispatch_handle, staging_wb->memory);
staging_wb->mapped_address = NULL;
if (res != VK_SUCCESS) {
WRAPPER_LOG(error, "Failed to flush staging buffer memory, res %d", res);
return false;
}

copy_region.bufferOffset = 0;
copy_region.bufferRowLength = 0;
copy_region.bufferImageHeight = 0;

device->dispatch_table.CmdCopyBufferToImage(wcb->dispatch_handle,
staging_wb->dispatch_handle, dstImage, dstLayout, 1, &copy_region);

staging_wb->wcb = wcb;
staging_wb->device = device;
list_addtail(&staging_wb->link, &wcb->bcn_transients);
return true;
}

static void
Expand Down Expand Up @@ -5543,8 +5596,9 @@ wrapper_bcn_cpu_copy_regions(struct wrapper_command_buffer *wcb,
}
}

wrapper_bcn_staging_submit(wcb, device, staging_wb, dstImage, dstLayout,
copy_region);
if (!wrapper_bcn_staging_submit(wcb, device, staging_wb, dstImage, dstLayout,
copy_region))
break;
}

if (wb->is_mapped) {
Expand Down
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