edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect row pitch of temporary image

Browse source
This commit is contained in:
Jupeyy 2022-04-01 18:47:40 +02:00
parent 6711593a82
commit bdfe2352e7
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/engine/client/backend/vulkan/backend_vulkan.cpp
View file

@ -905,6 +905,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
VkImage m_GetPresentedImgDataHelperImage = VK_NULL_HANDLE; VkImage m_GetPresentedImgDataHelperImage = VK_NULL_HANDLE;
uint8_t *m_pGetPresentedImgDataHelperMappedMemory = nullptr; uint8_t *m_pGetPresentedImgDataHelperMappedMemory = nullptr;
VkDeviceSize m_GetPresentedImgDataHelperMappedLayoutOffset = 0; VkDeviceSize m_GetPresentedImgDataHelperMappedLayoutOffset = 0;
VkDeviceSize m_GetPresentedImgDataHelperMappedLayoutPitch = 0;
uint32_t m_GetPresentedImgDataHelperWidth = 0; uint32_t m_GetPresentedImgDataHelperWidth = 0;
uint32_t m_GetPresentedImgDataHelperHeight = 0; uint32_t m_GetPresentedImgDataHelperHeight = 0;
VkFence m_GetPresentedImgDataHelperFence = VK_NULL_HANDLE; VkFence m_GetPresentedImgDataHelperFence = VK_NULL_HANDLE;
@ -1290,6 +1291,7 @@ protected:
vkMapMemory(m_VKDevice, m_GetPresentedImgDataHelperMem.m_Mem, 0, VK_WHOLE_SIZE, 0, (void **)&m_pGetPresentedImgDataHelperMappedMemory); vkMapMemory(m_VKDevice, m_GetPresentedImgDataHelperMem.m_Mem, 0, VK_WHOLE_SIZE, 0, (void **)&m_pGetPresentedImgDataHelperMappedMemory);
m_GetPresentedImgDataHelperMappedLayoutOffset = SubResourceLayout.offset; m_GetPresentedImgDataHelperMappedLayoutOffset = SubResourceLayout.offset;
m_GetPresentedImgDataHelperMappedLayoutPitch = SubResourceLayout.rowPitch;
m_pGetPresentedImgDataHelperMappedMemory += m_GetPresentedImgDataHelperMappedLayoutOffset; m_pGetPresentedImgDataHelperMappedMemory += m_GetPresentedImgDataHelperMappedLayoutOffset;
VkFenceCreateInfo FenceInfo{}; VkFenceCreateInfo FenceInfo{};
@ -1332,8 +1334,6 @@ protected:
Format = CImageInfo::FORMAT_RGBA; Format = CImageInfo::FORMAT_RGBA;
size_t ImageTotalSize = (size_t)Width * Height * 4; size_t ImageTotalSize = (size_t)Width * Height * 4;
if(DstData.size() < ImageTotalSize + (Width * 4))
DstData.resize(ImageTotalSize + (Width * 4)); // extra space for flipping
PreparePresentedImageDataImage(Width, Height); PreparePresentedImageDataImage(Width, Height);
@ -1419,7 +1419,22 @@ protected:
MemRange.size = VK_WHOLE_SIZE; MemRange.size = VK_WHOLE_SIZE;
vkInvalidateMappedMemoryRanges(m_VKDevice, 1, &MemRange); vkInvalidateMappedMemoryRanges(m_VKDevice, 1, &MemRange);
mem_copy(DstData.data(), m_pGetPresentedImgDataHelperMappedMemory, ImageTotalSize); size_t RealFullImageSize = maximum(ImageTotalSize, Height * m_GetPresentedImgDataHelperMappedLayoutPitch);
if(DstData.size() < RealFullImageSize + (Width * 4))
DstData.resize(RealFullImageSize + (Width * 4)); // extra space for flipping
mem_copy(DstData.data(), m_pGetPresentedImgDataHelperMappedMemory, RealFullImageSize);
// pack image data together without any offset that the driver might require
if(Width * 4 < m_GetPresentedImgDataHelperMappedLayoutPitch)
{
for(uint32_t Y = 0; Y < Height; ++Y)
{
size_t OffsetImagePacked = (Y * Width * 4);
size_t OffsetImageUnpacked = (Y * m_GetPresentedImgDataHelperMappedLayoutPitch);
mem_copy(DstData.data() + OffsetImagePacked, DstData.data() + OffsetImageUnpacked, Width * 4);
}
}
if(IsB8G8R8A8 || ResetAlpha) if(IsB8G8R8A8 || ResetAlpha)
{ {