From 6bf8798ecb964c64f9c6536a976f8b8c38f75080 Mon Sep 17 00:00:00 2001
From: Sil Vilerino <sivileri@microsoft.com>
Date: Fri, 8 Jul 2022 15:01:29 -0400
Subject: [PATCH] d3d12: Video - Remove unused spCopyQueues from enc/dec
 objects

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17557>
---
 src/gallium/drivers/d3d12/d3d12_video_dec.cpp | 10 ----------
 src/gallium/drivers/d3d12/d3d12_video_dec.h   |  1 -
 src/gallium/drivers/d3d12/d3d12_video_enc.cpp | 11 -----------
 src/gallium/drivers/d3d12/d3d12_video_enc.h   |  1 -
 4 files changed, 23 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_video_dec.cpp b/src/gallium/drivers/d3d12/d3d12_video_dec.cpp
index fef05e3..4db48d2 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_dec.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_dec.cpp
@@ -780,16 +780,6 @@ d3d12_video_decoder_create_command_objects(const struct d3d12_screen *pD3D12Scre
       return false;
    }
 
-   D3D12_COMMAND_QUEUE_DESC copyQueueDesc = { D3D12_COMMAND_LIST_TYPE_COPY };
-   hr = pD3D12Screen->dev->CreateCommandQueue(&copyQueueDesc, IID_PPV_ARGS(pD3D12Dec->m_spCopyQueue.GetAddressOf()));
-
-   if (FAILED(hr)) {
-      debug_printf("[d3d12_video_decoder] d3d12_video_decoder_create_command_objects - Call to CreateCommandQueue "
-                      "failed with HR %x\n",
-                      hr);
-      return false;
-   }
-
    return true;
 }
 
diff --git a/src/gallium/drivers/d3d12/d3d12_video_dec.h b/src/gallium/drivers/d3d12/d3d12_video_dec.h
index 0b69e6c..784957a 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_dec.h
+++ b/src/gallium/drivers/d3d12/d3d12_video_dec.h
@@ -107,7 +107,6 @@ struct d3d12_video_decoder
    ComPtr<ID3D12CommandQueue>            m_spDecodeCommandQueue;
    ComPtr<ID3D12CommandAllocator>        m_spCommandAllocator;
    ComPtr<ID3D12VideoDecodeCommandList1> m_spDecodeCommandList;
-   ComPtr<ID3D12CommandQueue>            m_spCopyQueue;
 
    std::vector<D3D12_RESOURCE_BARRIER> m_transitionsBeforeCloseCmdList;
 
diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp
index 568d326..a3ec658 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp
@@ -883,17 +883,6 @@ d3d12_video_encoder_create_command_objects(struct d3d12_video_encoder *pD3D12Enc
       return false;
    }
 
-   D3D12_COMMAND_QUEUE_DESC copyQueueDesc = { D3D12_COMMAND_LIST_TYPE_COPY };
-   hr                                     = pD3D12Enc->m_pD3D12Screen->dev->CreateCommandQueue(&copyQueueDesc,
-                                                           IID_PPV_ARGS(pD3D12Enc->m_spCopyQueue.GetAddressOf()));
-
-   if (FAILED(hr)) {
-      debug_printf("[d3d12_video_encoder] d3d12_video_encoder_create_command_objects - Call to CreateCommandQueue "
-                      "failed with HR %x\n",
-                      hr);
-      return false;
-   }
-
    return true;
 }
 
diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.h b/src/gallium/drivers/d3d12/d3d12_video_enc.h
index 9870fe4..5c5b362 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_enc.h
+++ b/src/gallium/drivers/d3d12/d3d12_video_enc.h
@@ -129,7 +129,6 @@ struct d3d12_video_encoder
    ComPtr<ID3D12CommandQueue>            m_spEncodeCommandQueue;
    ComPtr<ID3D12CommandAllocator>        m_spCommandAllocator;
    ComPtr<ID3D12VideoEncodeCommandList2> m_spEncodeCommandList;
-   ComPtr<ID3D12CommandQueue>            m_spCopyQueue;
    std::vector<D3D12_RESOURCE_BARRIER>   m_transitionsBeforeCloseCmdList;
 
    std::unique_ptr<d3d12_video_encoder_references_manager_interface> m_upDPBManager;
-- 
2.7.4