diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2017-03-07 01:07:02 +0100 |
|---|---|---|
| committer | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2017-03-07 09:58:33 +0100 |
| commit | 6424795f527826fab49564cd29d65806c6924ab6 (patch) | |
| tree | 4ef5bbdeead8dab02647109fa8b75a53d05f6379 | |
| parent | 3b455c1cb740c0357a0e748114b2c3b03d2dc4e2 (diff) | |
radv: Use the subresource range in HTILE initialization.
v2: fix levelCount assert.
Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 16 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 3796ae4b48..821306556e 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2704,14 +2704,20 @@ void radv_CmdEndRenderPass( static void radv_initialize_htile(struct radv_cmd_buffer *cmd_buffer, - struct radv_image *image) + struct radv_image *image, + const VkImageSubresourceRange *range) { + assert(range->baseMipLevel == 0); + assert(range->levelCount == 1 || range->levelCount == VK_REMAINING_ARRAY_LAYERS); + unsigned layer_count = radv_get_layerCount(image, range); + uint64_t size = image->surface.htile_slice_size * layer_count; + uint64_t offset = image->offset + image->htile_offset + + image->surface.htile_slice_size * range->baseArrayLayer; cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB | RADV_CMD_FLAG_FLUSH_AND_INV_DB_META; - radv_fill_buffer(cmd_buffer, image->bo, image->offset + image->htile_offset, - image->surface.htile_size, 0xffffffff); + radv_fill_buffer(cmd_buffer, image->bo, offset, size, 0xffffffff); cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB_META | RADV_CMD_FLAG_CS_PARTIAL_FLUSH | @@ -2736,10 +2742,10 @@ static void radv_handle_depth_image_transition(struct radv_cmd_buffer *cmd_buffe } else if (src_layout == VK_IMAGE_LAYOUT_UNDEFINED && radv_layout_has_htile(image, dst_layout)) { /* TODO: merge with the clear if applicable */ - radv_initialize_htile(cmd_buffer, image); + radv_initialize_htile(cmd_buffer, image, range); } else if (!radv_layout_has_htile(image, src_layout) && radv_layout_has_htile(image, dst_layout)) { - radv_initialize_htile(cmd_buffer, image); + radv_initialize_htile(cmd_buffer, image, range); } else if ((radv_layout_has_htile(image, src_layout) && !radv_layout_has_htile(image, dst_layout)) || (radv_layout_is_htile_compressed(image, src_layout) && diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 3d650b0271..dfd70a9eab 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -590,8 +590,7 @@ static void radv_image_alloc_htile(struct radv_device *device, struct radv_image *image) { - if ((device->debug_flags & RADV_DEBUG_NO_HIZ) || image->layers > 1 || - image->levels > 1) { + if ((device->debug_flags & RADV_DEBUG_NO_HIZ) || image->levels > 1) { image->surface.htile_size = 0; return; } |