From 9dd82a2e743b550f3fa69a7c84cab20264ae120e Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Sun, 30 Mar 2025 20:15:08 -0500 Subject: [PATCH] nvk: Use max_image_dimension for maxFramebufferWidth/Height Cc: mesa-stable Part-of: (cherry picked from commit 65d06d91cabff4f69c7047a810290c3b5e5e3e1a) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_physical_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 13087e0eb98..b619a1f40aa 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -914,7 +914,7 @@ "description": "nvk: Use max_image_dimension for maxFramebufferWidth/Height", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 9b05c1968aa..4600ee7879e 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -802,8 +802,8 @@ nvk_get_device_properties(const struct nvk_instance *instance, .minInterpolationOffset = -0.5, .maxInterpolationOffset = 0.4375, .subPixelInterpolationOffsetBits = 4, - .maxFramebufferHeight = info->cls_eng3d >= PASCAL_A ? 0x8000 : 0x4000, - .maxFramebufferWidth = info->cls_eng3d >= PASCAL_A ? 0x8000 : 0x4000, + .maxFramebufferHeight = nvk_image_max_dimension(info, VK_IMAGE_TYPE_2D), + .maxFramebufferWidth = nvk_image_max_dimension(info, VK_IMAGE_TYPE_2D), .maxFramebufferLayers = 2048, .framebufferColorSampleCounts = sample_counts, .framebufferDepthSampleCounts = sample_counts,