Convert RGB pixel data to RGBA when staging

[libs/gl.git] / source / backends / vulkan / texturecube_backend.cpp

diff --git a/source/backends/vulkan/texturecube_backend.cpp b/source/backends/vulkan/texturecube_backend.cpp
index 98f000447c8a2f3aef69cacdfe20e929719d73dc..6a4e598c0c103b0ece427cbcd34bc07faa330f09 100644 (file)
--- a/source/backends/vulkan/texturecube_backend.cpp
+++ b/source/backends/vulkan/texturecube_backend.cpp
@@ -43,7 +43,7 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
 
                        VkBufferImageCopy region = { };
                        region.bufferOffset = src_off;
-                       region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+                       region.imageSubresource.aspectMask = get_vulkan_aspect(get_components(storage_fmt));
                        region.imageSubresource.mipLevel = level;
                        region.imageSubresource.baseArrayLayer = face;
                        region.imageSubresource.layerCount = 1;
@@ -52,8 +52,7 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
                        vk.CmdCopyBufferToImage(cmd_buf, staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
                });
 
-       const char *src = static_cast<const char *>(data);
-       copy(src, src+data_size, static_cast<char *>(staging));
+       stage_pixels(staging, data, wd*ht);
 }
 
 void VulkanTextureCube::generate_mipmap()