From e8d9a913d8f053e2869101a3825257b57b2cec79 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Wed, 15 Jul 2026 23:18:46 -0400 Subject: [PATCH] [Fix] (MG_Util/SelfTest): preserve POST checks before format probing --- MobileGL/MG_Util/SelfTest/DriverPost.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/MobileGL/MG_Util/SelfTest/DriverPost.cpp b/MobileGL/MG_Util/SelfTest/DriverPost.cpp index 6cb8c4ec..82d93ee3 100644 --- a/MobileGL/MG_Util/SelfTest/DriverPost.cpp +++ b/MobileGL/MG_Util/SelfTest/DriverPost.cpp @@ -525,11 +525,11 @@ namespace MobileGL::MG_Util::SelfTest { summary.capsValid = true; const MG_External::GLESCapabilities& caps = summary.caps; builder.report.rendererInfo = format("{} ({})", caps.GLESRendererString, caps.GLESVersionString); + EvaluateGlesChecklist(builder, caps, glesFuncs); + ProbeGlesTimerQuery(builder, caps, glesFuncs); builder.report.formatCapabilities.emplace(); MG_Backend::DirectGLES::PopulateFormatCapabilities( glesFuncs, caps, builder.report.formatCapabilities.value()); - EvaluateGlesChecklist(builder, caps, glesFuncs); - ProbeGlesTimerQuery(builder, caps, glesFuncs); } while (false); } @@ -1065,14 +1065,6 @@ namespace MobileGL::MG_Util::SelfTest { summary.deviceName = String(properties.deviceName); summary.apiVersionString = VkApiVersionToString(properties.apiVersion); summary.driverVersionString = driverVersionString; - if (vkGetPhysicalDeviceFormatPropertiesFn != nullptr) { - MG_External::VulkanCapabilities formatProbeCapabilities{}; - BackendLoader::FillInVulkanCapabilities(formatProbeCapabilities, properties); - builder.report.formatCapabilities.emplace(); - MG_Backend::DirectVulkan::PopulateFormatCapabilities( - physicalDevice, vkGetPhysicalDeviceFormatPropertiesFn, formatProbeCapabilities, - builder.report.formatCapabilities.value()); - } // The chosen-device facts (name, enumeration count, graphics queue) ride along // on both outcomes so the device API verdict never hides them. @@ -1260,6 +1252,14 @@ namespace MobileGL::MG_Util::SelfTest { timestampPeriod) + TimerQueryDisabledNote()); } + if (vkGetPhysicalDeviceFormatPropertiesFn != nullptr) { + MG_External::VulkanCapabilities formatProbeCapabilities{}; + BackendLoader::FillInVulkanCapabilities(formatProbeCapabilities, properties); + builder.report.formatCapabilities.emplace(); + MG_Backend::DirectVulkan::PopulateFormatCapabilities( + physicalDevice, vkGetPhysicalDeviceFormatPropertiesFn, formatProbeCapabilities, + builder.report.formatCapabilities.value()); + } } BackendPostReport RunVulkanDriverPost() {