From 01bca083e8f1ea5e43ac46958831dd473f70579c Mon Sep 17 00:00:00 2001
From: Silvio Vilerino <sivileri@microsoft.com>
Date: Thu, 22 Jan 2026 09:40:33 -0500
Subject: [PATCH] d3d12: Add missing using Microsoft::WRL:ComPtr in
 d3d12_context_common

Fixes: b06b2fbaba0 ("d3d12: Remove Agility v717 guards for features now available in v618")
(cherry picked from commit 237313a2439bf73d8eb8830bddc95d1fc3420e17)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39745>
---
 .pick_status.json                                  | 2 +-
 src/gallium/drivers/d3d12/d3d12_context_common.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 931f5216314..a13395fa284 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -594,7 +594,7 @@
         "description": "d3d12: Add missing using Microsoft::WRL:ComPtr in d3d12_context_common",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b06b2fbaba0902885bb97f4d0fe643a8f2d82993",
         "notes": null
diff --git a/src/gallium/drivers/d3d12/d3d12_context_common.cpp b/src/gallium/drivers/d3d12/d3d12_context_common.cpp
index d38e66c150b..e97af4c5c10 100644
--- a/src/gallium/drivers/d3d12/d3d12_context_common.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_context_common.cpp
@@ -62,6 +62,11 @@
 #include <string.h>
 #include "d3d12_interop_public.h"
 
+#ifndef _GAMING_XBOX
+#include <wrl/client.h>
+using Microsoft::WRL::ComPtr;
+#endif
+
 static void
 d3d12_context_destroy(struct pipe_context *pctx)
 {