From d7d31708fad101db80b4e8e65d04b79dea16769a Mon Sep 17 00:00:00 2001
From: "Pohsiang (John) Hsu" <pohhsu@microsoft.com>
Date: Tue, 17 Jun 2025 09:39:06 -0700
Subject: [PATCH] d3d12: fix failure when building with v1.717.0-preview and
 running on Windows 11 without Agility Pack

remove wrong #else statment preventing falling back to old interface.

Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35690>
---
 src/gallium/drivers/d3d12/d3d12_video_enc.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp
index b45c0aec9e4..9c396cf7db7 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp
@@ -1010,7 +1010,7 @@ d3d12_video_encoder_reconfigure_encoder_objects(struct d3d12_video_encoder *pD3D
          }
       }
       else
-#else // D3D12_VIDEO_USE_NEW_ENCODECMDLIST4_INTERFACE
+#endif // D3D12_VIDEO_USE_NEW_ENCODECMDLIST4_INTERFACE
       {
          D3D12_VIDEO_ENCODER_HEAP_DESC heapDesc = { pD3D12Enc->m_NodeMask,
                                                    D3D12_VIDEO_ENCODER_HEAP_FLAG_NONE,
@@ -1027,7 +1027,6 @@ d3d12_video_encoder_reconfigure_encoder_objects(struct d3d12_video_encoder *pD3D
          hr = pD3D12Enc->m_spD3D12VideoDevice->CreateVideoEncoderHeap(&heapDesc,
                                                                               IID_PPV_ARGS(pD3D12Enc->m_spVideoEncoderHeap.GetAddressOf()));
       }
-#endif // D3D12_VIDEO_USE_NEW_ENCODECMDLIST4_INTERFACE
 
       if (FAILED(hr)) {
          debug_printf("CreateVideoEncoderHeap failed with HR %x\n", hr);