From 4de1444c358cb2e89701393de28504bf555bb4cf Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 30 Jun 2025 16:55:03 -0400 Subject: [PATCH] nvk: Bump the conformance version to 1.4.3 Backport-to: 25.2 Part-of: (cherry picked from commit d3ab663a77a528cfebb11f76b2a4e540dfcc7b3b) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_physical_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 464eb779160..73448cb52f3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2754,7 +2754,7 @@ "description": "nvk: Bump the conformance version to 1.4.3", "nominated": true, "nomination_type": 4, - "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 73b2a22a488..4dd39a3353d 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -880,7 +880,7 @@ nvk_get_device_properties(const struct nvk_instance *instance, .independentResolve = true, .driverID = VK_DRIVER_ID_MESA_NVK, .conformanceVersion = - conformant ? (VkConformanceVersion) { 1, 4, 1, 3 } + conformant ? (VkConformanceVersion) { 1, 4, 3, 0 } : (VkConformanceVersion) { 0, 0, 0, 0 }, .denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL, .roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL,