aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2019-07-11 14:24:37 +0200
committerSamuel Pitoiset <[email protected]>2019-07-11 14:44:47 +0200
commit022b1f419075b9cfb2b68b8231ab66bf57318334 (patch)
treecc1dd33a5d7898eab45a6f69eb3975029c466794
parentf3dfdd4091dbe821f23fef7141d091f7ffc6e292 (diff)
radv/gfx10: fix maximum number of mip levels for 3D images
The dimensions also have to be adjusted if the number of supported mip levels is changed. This fixes dEQP-VK.api.info.image_format_properties.3d.*. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]>
-rw-r--r--src/amd/vulkan/radv_formats.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index 26fc4b9ba18..98c84edbdc1 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -1150,10 +1150,16 @@ static VkResult radv_get_image_format_properties(struct radv_physical_device *ph
maxArraySize = chip_class >= GFX10 ? 8192 : 2048;
break;
case VK_IMAGE_TYPE_3D:
- maxExtent.width = 2048;
- maxExtent.height = 2048;
- maxExtent.depth = 2048;
- maxMipLevels = chip_class >= GFX10 ? 14 : 12; /* log2(maxWidth) + 1 */
+ if (chip_class >= GFX10) {
+ maxExtent.width = 8192;
+ maxExtent.height = 8192;
+ maxExtent.depth = 8192;
+ } else {
+ maxExtent.width = 2048;
+ maxExtent.height = 2048;
+ maxExtent.depth = 2048;
+ }
+ maxMipLevels = util_logbase2(maxExtent.width) + 1;
maxArraySize = 1;
break;
}