Fix GPU driver deadlock by implementing static cache for HDR luminance hardware detection

Author: justnullname

QuickView/DisplayColorInfo.cpp

@@ -137,8 +137,14 @@ float QueryIccPeakLuminance(const std::wstring& gdiDeviceName) {
 }
 
 } // namespace
+    
+static float s_cachedHardwarePeakNits = -1.0f;
+static float s_cachedSdrWhiteLevel = -1.0f;
 
-
+void DisplayColorInfo::InvalidateHardwareCache() {
+    s_cachedHardwarePeakNits = -1.0f;
+    s_cachedSdrWhiteLevel = -1.0f;
+}
 
 float DisplayColorState::GetEffectivePeakNits(float peakNitsOverride) const {
     float peak = (maxLuminanceNits > sdrWhiteLevelNits) ? maxLuminanceNits : sdrWhiteLevelNits;
@@ -264,6 +270,12 @@ bool DisplayColorInfo::QueryForMonitor(HMONITOR monitor, DisplayColorState* stat
             // [Logging] Capture Level 3 detection (Raw DXGI/EDID)
             float dxgiPeak = stateOut->maxLuminanceNits;
 
+            if (s_cachedHardwarePeakNits > 0.0f) {
+                stateOut->maxLuminanceNits = s_cachedHardwarePeakNits;
+                stateOut->sdrWhiteLevelNits = s_cachedSdrWhiteLevel;
+                return true;
+            }
+
             // Get accurate Peak Luminance and SDR white via a multi-tier fallback pipeline.
             float winrtMaxNits = 0.0f;
             float winrtSdrWhite = 0.0f;
@@ -293,6 +305,9 @@ bool DisplayColorInfo::QueryForMonitor(HMONITOR monitor, DisplayColorState* stat
             } else {
                 stateOut->sdrWhiteLevelNits = QuerySdrWhiteLevelNits(stateOut->gdiDeviceName);
             }
+            
+            s_cachedHardwarePeakNits = stateOut->maxLuminanceNits;
+            s_cachedSdrWhiteLevel = stateOut->sdrWhiteLevelNits;
 
             return true;
         }

QuickView/DisplayColorInfo.h

@@ -112,6 +112,7 @@ class DisplayColorInfo {
 public:
     bool Refresh(HWND hwnd, bool forceHdrSimulation = false);
     static bool QueryMonitorState(HMONITOR monitor, DisplayColorState* stateOut);
+    static void InvalidateHardwareCache();
     const DisplayColorState& GetState() const { return m_state; }
 
 private:

QuickView/ImageLoader.cpp

@@ -5369,7 +5369,7 @@ namespace QuickView {
                 // [Ultra HDR] Phase 2: Extract MPF Gain Map (uses pBuf which
                 // is still alive — it's the original file buffer)
                 // ============================================================
-                if (hasUltraHdr) {
+                if (hasUltraHdr && !PrefersSdrTarget(ctx)) {
                     result.metadata.hdrMetadata.hasGainMap = true;
                     result.metadata.hdrMetadata.isValid = true;
                     result.metadata.hdrMetadata.transfer = QuickView::TransferFunction::SRGB;
@@ -6021,7 +6021,9 @@ namespace QuickView {
                 avifDecoder* decoder = avifDecoderCreate();
                 if (!decoder) return E_OUTOFMEMORY;
 
-                decoder->imageContentToDecode |= AVIF_IMAGE_CONTENT_GAIN_MAP;
+                if (!PrefersSdrTarget(ctx)) {
+                    decoder->imageContentToDecode |= AVIF_IMAGE_CONTENT_GAIN_MAP;
+                }
 
                 decoder->strictFlags = AVIF_STRICT_DISABLED;
                 const unsigned int threads = std::thread::hardware_concurrency();
@@ -7156,7 +7158,7 @@ HRESULT CImageLoader::LoadImageUnified(LPCWSTR filePath, const DecodeContext& ct
             HRESULT hr = WIC_HEIC::Load(filePath, ctx, result, m_wicFactory.Get());
             if (SUCCEEDED(hr)) {
                 // [v10.3] Async Gain Map Decode for HEIC
-                if (result.metadata.hdrMetadata.hasGainMap && ctx.onAuxLayerReady) {
+                if (result.metadata.hdrMetadata.hasGainMap && ctx.onAuxLayerReady && !PrefersSdrTarget(ctx)) {
                     // Copy necessary data to pass to thread
                     std::vector<uint8_t> threadData(mappedData, mappedData + mappedSize);
                     float headroom = result.metadata.hdrMetadata.gainMapAlternateHeadroom;

QuickView/main.cpp

@@ -6362,6 +6362,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         HMONITOR hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
         if (hMon != s_lastCmsMonitor) {
             s_lastCmsMonitor = hMon;
+            QuickView::DisplayColorInfo::InvalidateHardwareCache();
             RefreshDisplayColorPipeline(hwnd, false);
             // Trigger CMS update (All managed modes now depend on the current monitor profile)
             extern AppConfig g_config;
@@ -6376,11 +6377,13 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     case WM_DISPLAYCHANGE: {
         // [CMS] System/Monitor profile changed
+        QuickView::DisplayColorInfo::InvalidateHardwareCache();
         RefreshDisplayColorPipeline(hwnd, true);
         break;
     }
     case WM_SETTINGCHANGE:
     case WM_THEMECHANGED: {
+        QuickView::DisplayColorInfo::InvalidateHardwareCache();
         if (g_config.ThemeMode == 0) {
             ApplyWindowTheme(hwnd);
             RequestRepaint(PaintLayer::All);
@@ -6801,6 +6804,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         // wParam: LOWORD = new X DPI, HIWORD = new Y DPI
         // lParam: pointer to RECT with suggested new window size/position
         const UINT newDpiX = LOWORD(wParam);
+        QuickView::DisplayColorInfo::InvalidateHardwareCache();
         RefreshWindowDpi(hwnd, newDpiX);
 
         RECT* pNewRect = (RECT*)lParam;