mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add in numLayers to ReadBackVK utility class so that it properly copies texture arrays when called by bgfx::readTexture.

Browse Source
This commit is contained in:
paul gruenbacher 2023-12-31 15:53:03 -06:00
parent a0057adaaa
commit a583dc1d88
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/renderer_vk.cpp
View File

@ -2305,6 +2305,7 @@ VK_IMPORT_DEVICE
uint32_t height = bx::uint32_max(1, texture.m_height >> _mip); uint32_t height = bx::uint32_max(1, texture.m_height >> _mip);
uint32_t pitch = texture.m_readback.pitch(_mip); uint32_t pitch = texture.m_readback.pitch(_mip);
uint32_t size = height * pitch; uint32_t size = height * pitch;
size *= bx::uint32_max(1, texture.m_numLayers);
VkDeviceMemory stagingMemory; VkDeviceMemory stagingMemory;
VkBuffer stagingBuffer; VkBuffer stagingBuffer;
@ -2320,7 +2321,8 @@ VK_IMPORT_DEVICE
kick(true); kick(true);
texture.m_readback.readback(stagingMemory, 0, _data, _mip); uint32_t memRead = texture.m_readback.readback(stagingMemory, 0, _data, _mip);
BX_ASSERT(memRead == size, "Readback did not copy the same amount of memory as allocated in stagingBuffer");
vkDestroy(stagingBuffer); vkDestroy(stagingBuffer);
vkDestroy(stagingMemory); vkDestroy(stagingMemory);
@ -4031,7 +4033,7 @@ VK_IMPORT_DEVICE
const uint32_t height = _swapChain.m_sci.imageExtent.height; const uint32_t height = _swapChain.m_sci.imageExtent.height;
ReadbackVK readback; ReadbackVK readback;
readback.create(image, width, height, _swapChain.m_colorFormat); readback.create(image, width, height, 1 /*numLayer*/, _swapChain.m_colorFormat);
const uint32_t pitch = readback.pitch(); const uint32_t pitch = readback.pitch();
readback.copyImageToBuffer(m_commandBuffer, _buffer, layout, VK_IMAGE_ASPECT_COLOR_BIT); readback.copyImageToBuffer(m_commandBuffer, _buffer, layout, VK_IMAGE_ASPECT_COLOR_BIT);
@ -5594,12 +5596,13 @@ VK_DESTROY
} }
} }
void ReadbackVK::create(VkImage _image, uint32_t _width, uint32_t _height, TextureFormat::Enum _format) void ReadbackVK::create(VkImage _image, uint32_t _width, uint32_t _height, uint32_t _numLayers, TextureFormat::Enum _format)
{ {
m_image = _image; m_image = _image;
m_width = _width; m_width = _width;
m_height = _height; m_height = _height;
m_format = _format; m_format = _format;
m_numLayers = _numLayers;
} }
void ReadbackVK::destroy() void ReadbackVK::destroy()
@ -5626,9 +5629,6 @@ VK_DESTROY
, _layout , _layout
, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL , VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL
, _mip , _mip
, 1
, 0
, 1
); );
VkBufferImageCopy bic; VkBufferImageCopy bic;
@ -5638,7 +5638,7 @@ VK_DESTROY
bic.imageSubresource.aspectMask = _aspect; bic.imageSubresource.aspectMask = _aspect;
bic.imageSubresource.mipLevel = _mip; bic.imageSubresource.mipLevel = _mip;
bic.imageSubresource.baseArrayLayer = 0; bic.imageSubresource.baseArrayLayer = 0;
bic.imageSubresource.layerCount = 1; bic.imageSubresource.layerCount = m_numLayers;
bic.imageOffset = { 0, 0, 0 }; bic.imageOffset = { 0, 0, 0 };
bic.imageExtent = { mipWidth, mipHeight, 1 }; bic.imageExtent = { mipWidth, mipHeight, 1 };
@ -5665,20 +5665,20 @@ VK_DESTROY
, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL , VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL
, _layout , _layout
, _mip , _mip
, 1
, 0
, 1
); );
} }
void ReadbackVK::readback(VkDeviceMemory _memory, VkDeviceSize _offset, void* _data, uint8_t _mip) const uint32_t ReadbackVK::readback(VkDeviceMemory _memory, VkDeviceSize _offset, void* _data, uint8_t _mip) const
{ {
if (m_image == VK_NULL_HANDLE) if (m_image == VK_NULL_HANDLE)
{ {
return; return 0;
} }
uint32_t mipHeight = bx::uint32_max(1, m_height >> _mip); uint32_t mipHeight = bx::uint32_max(1, m_height >> _mip);
// for texture arrays we iterate over each layer as well.
mipHeight *= bx::uint32_max(1, m_numLayers);
uint32_t rowPitch = pitch(_mip); uint32_t rowPitch = pitch(_mip);
uint8_t* src; uint8_t* src;
@ -5686,14 +5686,17 @@ VK_DESTROY
src += _offset; src += _offset;
uint8_t* dst = (uint8_t*)_data; uint8_t* dst = (uint8_t*)_data;
uint32_t memRead = 0;
for (uint32_t yy = 0; yy < mipHeight; ++yy) for (uint32_t yy = 0; yy < mipHeight; ++yy)
{ {
bx::memCopy(dst, src, rowPitch); bx::memCopy(dst, src, rowPitch);
src += rowPitch; src += rowPitch;
dst += rowPitch; dst += rowPitch;
memRead += rowPitch;
} }
vkUnmapMemory(s_renderVK->m_device, _memory); vkUnmapMemory(s_renderVK->m_device, _memory);
return memRead;
} }
VkResult TextureVK::create(VkCommandBuffer _commandBuffer, uint32_t _width, uint32_t _height, uint64_t _flags, VkFormat _format) VkResult TextureVK::create(VkCommandBuffer _commandBuffer, uint32_t _width, uint32_t _height, uint64_t _flags, VkFormat _format)
@ -6130,7 +6133,7 @@ VK_DESTROY
bx::free(g_allocator, imageInfos); bx::free(g_allocator, imageInfos);
m_readback.create(m_textureImage, m_width, m_height, TextureFormat::Enum(m_textureFormat) ); m_readback.create(m_textureImage, m_width, m_height, m_numLayers, TextureFormat::Enum(m_textureFormat) );
} }
return m_directAccessPtr; return m_directAccessPtr;

5
src/renderer_vk.h
View File

@ -623,15 +623,16 @@ VK_DESTROY_FUNC(DescriptorSet);
struct ReadbackVK struct ReadbackVK
{ {
void create(VkImage _image, uint32_t _width, uint32_t _height, TextureFormat::Enum _format); void create(VkImage _image, uint32_t _width, uint32_t _height, uint32_t _numLayers, TextureFormat::Enum _format);
void destroy(); void destroy();
uint32_t pitch(uint8_t _mip = 0) const; uint32_t pitch(uint8_t _mip = 0) const;
void copyImageToBuffer(VkCommandBuffer _commandBuffer, VkBuffer _buffer, VkImageLayout _layout, VkImageAspectFlags _aspect, uint8_t _mip = 0) const; void copyImageToBuffer(VkCommandBuffer _commandBuffer, VkBuffer _buffer, VkImageLayout _layout, VkImageAspectFlags _aspect, uint8_t _mip = 0) const;
void readback(VkDeviceMemory _memory, VkDeviceSize _offset, void* _data, uint8_t _mip = 0) const; uint32_t readback(VkDeviceMemory _memory, VkDeviceSize _offset, void* _data, uint8_t _mip = 0) const;
VkImage m_image; VkImage m_image;
uint32_t m_width; uint32_t m_width;
uint32_t m_height; uint32_t m_height;
uint32_t m_numLayers;
TextureFormat::Enum m_format; TextureFormat::Enum m_format;
}; };