From 6646a04439c2e424d11726c2737472b3ea26ad9a Mon Sep 17 00:00:00 2001 From: columbarius Date: Sun, 24 Sep 2023 00:29:10 +0200 Subject: [PATCH] vulkan: fix read_pixels --- spa/plugins/vulkan/vulkan-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spa/plugins/vulkan/vulkan-utils.c b/spa/plugins/vulkan/vulkan-utils.c index d6f97645f..28e2ca91b 100644 --- a/spa/plugins/vulkan/vulkan-utils.c +++ b/spa/plugins/vulkan/vulkan-utils.c @@ -355,13 +355,13 @@ int vulkan_read_pixels(struct vulkan_base *s, struct vulkan_read_pixels_info *in const char *d = (const char *)v + img_sub_layout.offset; unsigned char *p = (unsigned char *)info->data + info->offset; - uint32_t bytes_per_pixel = 16; uint32_t pack_stride = img_sub_layout.rowPitch; + spa_log_trace_fp(s->log, "Read pixels: %p to %p, stride: %d, width %d, height %d, offset %d, pack_stride %d", d, p, info->stride, info->size.width, info->size.height, info->offset, pack_stride); if (pack_stride == info->stride) { memcpy(p, d, info->stride * info->size.height); } else { for (uint32_t i = 0; i < info->size.height; i++) { - memcpy(p + i * info->stride, d + i * pack_stride, info->size.width * bytes_per_pixel); + memcpy(p + i * info->stride, d + i * pack_stride, info->size.width * info->bytes_per_pixel); } } vkUnmapMemory(s->device, vk_buf->memory);