AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gsk: vulkan: fix image uploading

Browse Source 
The memory alignment requirements are different from the image layout.
We want the rowPitch to know where to upload the lines.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

https://bugzilla.gnome.org/show_bug.cgi?id=786485
This commit is contained in:
Lionel Landwerlin 2017-08-18 20:38:54 +01:00 committed by Matthias Clasen
parent 652a99ff9f
commit 48df19287b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gsk/gskvulkanimage.c
View File

@ -203,20 +203,22 @@ gsk_vulkan_image_upload_data (GskVulkanImage *self,
gsize height, gsize height,
gsize data_stride) gsize data_stride)
{ {
VkMemoryRequirements requirements; VkImageSubresource image_res;
VkSubresourceLayout image_layout;
gsize mem_stride; gsize mem_stride;
guchar *mem; guchar *mem;
image_res.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
image_res.mipLevel = 0;
image_res.arrayLayer = 0;
mem_stride = width * 4; mem_stride = width * 4;
vkGetImageMemoryRequirements (gdk_vulkan_context_get_device (self->vulkan), vkGetImageSubresourceLayout (gdk_vulkan_context_get_device (self->vulkan),
self->vk_image, self->vk_image, &image_res, &image_layout);
&requirements);
if (mem_stride % requirements.alignment != 0)
mem_stride = (mem_stride / requirements.alignment + 1) * requirements.alignment;
mem = gsk_vulkan_memory_map (self->memory); mem = gsk_vulkan_memory_map (self->memory) + image_layout.offset;
if (data_stride == width * 4 && data_stride == mem_stride) if (image_layout.rowPitch == width * 4 && data_stride == mem_stride)
{ {
memcpy (mem, data, data_stride * height); memcpy (mem, data, data_stride * height);
} }
@ -224,7 +226,7 @@ gsk_vulkan_image_upload_data (GskVulkanImage *self,
{ {
for (gsize i = 0; i < height; i++) for (gsize i = 0; i < height; i++)
{ {
memcpy (mem + i * mem_stride, data + i * data_stride, width * 4); memcpy (mem + i * image_layout.rowPitch, data + i * data_stride, width * 4);
} }
} }