griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Vulkan: Readback Texture Views

Browse Source 
When using EEVEE-Next the final render data is readback from texture
views. This wasn't implemented yet.

This PR adds support for reading back texture views. It also makes sure
the correct layer is read when reading back data from framebuffers and
adds internal support to read back a partial texture.

Pull Request: https://projects.blender.org/blender/blender/pulls/114411
This commit is contained in:
Jeroen Bakker
2023-11-02 15:55:05 +01:00
parent 40a46629a2
commit 0f5abc5a8b
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/gpu/vulkan/vk_framebuffer.cc
View File

@@ -241,16 +241,18 @@ void VKFrameBuffer::read(eGPUFrameBufferBits plane,
void *r_data)
{
VKContext &context = *VKContext::get();
VKTexture *texture = nullptr;
GPUAttachment *attachment = nullptr;
switch (plane) {
case GPU_COLOR_BIT:
attachment = &attachments_[GPU_FB_COLOR_ATTACHMENT0 + slot];
color_attachment_layout_ensure(context, slot, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
texture = unwrap(unwrap(color_tex(slot)));
break;
case GPU_DEPTH_BIT:
attachment = attachments_[GPU_FB_DEPTH_ATTACHMENT].tex ?
&attachments_[GPU_FB_DEPTH_ATTACHMENT] :
&attachments_[GPU_FB_DEPTH_STENCIL_ATTACHMENT];
depth_attachment_layout_ensure(context, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
texture = unwrap(unwrap(depth_tex()));
break;
default:
@@ -258,10 +260,16 @@ void VKFrameBuffer::read(eGPUFrameBufferBits plane,
return;
}
VKTexture *texture = unwrap(unwrap(attachment->tex));
BLI_assert_msg(texture,
"Trying to read back texture from framebuffer, but no texture is available in "
"requested slot.");
texture->read_sub(0, format, area, r_data);
if (texture == nullptr) {
return;
}
IndexRange layers(max_ii(attachment->layer, 0), 1);
texture->read_sub(0, format, area, layers, r_data);
}
/** \} */

38
source/blender/gpu/vulkan/vk_texture.cc
View File

@@ -207,32 +207,33 @@ void VKTexture::mip_range_set(int min, int max)
flags_ |= IMAGE_VIEW_DIRTY;
}
void VKTexture::read_sub(int mip, eGPUDataFormat format, const int area[4], void *r_data)
void VKTexture::read_sub(
int mip, eGPUDataFormat format, const int region[4], const IndexRange layers, void *r_data)
{
BLI_assert(!is_texture_view());
VKContext &context = *VKContext::get();
layout_ensure(context, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
/* Vulkan images cannot be directly mapped to host memory and requires a staging buffer. */
VKBuffer staging_buffer;
size_t sample_len = area[2] * area[3] * vk_layer_count(1);
size_t sample_len = (region[2] - region[0]) * (region[3] - region[1]) * layers.size();
size_t device_memory_size = sample_len * to_bytesize(format_);
staging_buffer.create(device_memory_size, GPU_USAGE_DYNAMIC, VK_BUFFER_USAGE_TRANSFER_DST_BIT);
VkBufferImageCopy region = {};
region.imageOffset.x = area[0];
region.imageOffset.y = area[1];
region.imageExtent.width = area[2];
region.imageExtent.height = area[3];
region.imageExtent.depth = 1;
region.imageSubresource.aspectMask = to_vk_image_aspect_flag_bits(format_);
region.imageSubresource.mipLevel = mip;
region.imageSubresource.layerCount = vk_layer_count(1);
VkBufferImageCopy buffer_image_copy = {};
buffer_image_copy.imageOffset.x = region[0];
buffer_image_copy.imageOffset.y = region[1];
buffer_image_copy.imageExtent.width = region[2];
buffer_image_copy.imageExtent.height = region[3];
buffer_image_copy.imageExtent.depth = 1;
buffer_image_copy.imageSubresource.aspectMask = to_vk_image_aspect_flag_bits(format_);
buffer_image_copy.imageSubresource.mipLevel = mip;
buffer_image_copy.imageSubresource.baseArrayLayer = layers.start();
buffer_image_copy.imageSubresource.layerCount = layers.size();
VKCommandBuffers &command_buffers = context.command_buffers_get();
command_buffers.copy(staging_buffer, *this, Span<VkBufferImageCopy>(&region, 1));
command_buffers.copy(staging_buffer, *this, Span<VkBufferImageCopy>(&buffer_image_copy, 1));
context.flush();
convert_device_to_host(r_data, staging_buffer.mapped_memory_get(), sample_len, format, format_);
@@ -240,15 +241,15 @@ void VKTexture::read_sub(int mip, eGPUDataFormat format, const int area[4], void
void *VKTexture::read(int mip, eGPUDataFormat format)
{
BLI_assert(!is_texture_view());
int mip_size[3] = {1, 1, 1};
mip_size_get(mip, mip_size);
size_t sample_len = mip_size[0] * mip_size[1] * vk_layer_count(1);
IndexRange layers = IndexRange(layer_offset_, vk_layer_count(1));
size_t sample_len = mip_size[0] * mip_size[1] * layers.size();
size_t host_memory_size = sample_len * to_bytesize(format_, format);
void *data = MEM_mallocN(host_memory_size, __func__);
int area[4] = {0, 0, mip_size[0], mip_size[1]};
read_sub(mip, format, area, data);
int region[4] = {0, 0, mip_size[0], mip_size[1]};
read_sub(mip, format, region, layers, data);
return data;
}
@@ -621,6 +622,9 @@ IndexRange VKTexture::layer_range() const
int VKTexture::vk_layer_count(int non_layered_value) const
{
if (is_texture_view()) {
return 1;
}
return type_ == GPU_TEXTURE_CUBE ? d_ :
(type_ & GPU_TEXTURE_ARRAY) ? layer_count() :
non_layered_value;

3
source/blender/gpu/vulkan/vk_texture.hh
View File

@@ -64,7 +64,8 @@ class VKTexture : public Texture, public VKBindableResource {
void swizzle_set(const char swizzle_mask[4]) override;
void mip_range_set(int min, int max) override;
void *read(int mip, eGPUDataFormat format) override;
void read_sub(int mip, eGPUDataFormat format, const int area[4], void *r_data);
void read_sub(
int mip, eGPUDataFormat format, const int area[4], IndexRange layers, void *r_data);
void update_sub(
int mip, int offset[3], int extent[3], eGPUDataFormat format, const void *data) override;
void update_sub(int offset[3],