lavapipe: Do not adjust imageGranularity for different block sizes

Fixes: d747c4a ("lavapipe: Implement sparse buffers and images")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31038>
This commit is contained in:
Konstantin Seurer
2024-09-05 11:51:57 +02:00
committed by Marge Bot
parent 1ad1b356fc
commit a53f11261f
2 changed files with 3 additions and 4 deletions

View File

@@ -645,7 +645,6 @@ dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.formats.r8_sint.input.d
dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.formats.r32g32_sint.input.load.dont_care.clear_draw,Fail
dEQP-VK.dynamic_rendering.graphics_pipeline_library.dedicated_allocation.formats.r16_sint.input.dont_care.dont_care.clear_draw,Fail
dEQP-VK.dynamic_rendering.graphics_pipeline_library.dedicated_allocation.formats.a8_unorm_khr.input.dont_care.dont_care.clear_draw,Fail
dEQP-VK.sparse_resources.image_block_shapes.2d_array.g8b8g8r8_422_unorm.samples_1,Fail
dEQP-VK.dynamic_rendering.primary_cmd_buff.dedicated_allocation.formats.r16g16b16a16_sfloat.input.clear.dont_care.draw,Fail
dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.formats.a2b10g10r10_unorm_pack32.input.clear.dont_care.clear_draw,Fail
dEQP-VK.dynamic_rendering.graphics_pipeline_library.suballocation.attachment_allocation.input_output_chain.21,Fail

View File

@@ -520,9 +520,9 @@ fill_sparse_image_format_properties(struct lvp_physical_device *pdev, VkImageTyp
prop->aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
prop->flags = 0;
prop->imageGranularity = (VkExtent3D){
.width = util_format_get_tilesize(pformat, type + 1, samples, 0) * util_format_get_blockwidth(pformat),
.height = util_format_get_tilesize(pformat, type + 1, samples, 1) * util_format_get_blockheight(pformat),
.depth = util_format_get_tilesize(pformat, type + 1, samples, 2) * util_format_get_blockdepth(pformat),
.width = util_format_get_tilesize(pformat, type + 1, samples, 0),
.height = util_format_get_tilesize(pformat, type + 1, samples, 1),
.depth = util_format_get_tilesize(pformat, type + 1, samples, 2),
};
}