commit 1a232448d25eb1ecd17b566cf1073f0fd714d6ac
author Bryan Bernhart <bryan.bernhart@intel.com> Thu Mar 25 21:31:34 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Mar 25 21:31:34 2021 +0000
tree 358da8d00318c89c4d350abdbca4222a9f2702be
parent d9b56a02c5780dd0479281a016cc85c4b990b6a2

D3D12: Remove WrapSharedHandle

Removes WrapSharedHandle in favor of using
ExternalImageDXGI.

BUG=dawn:625

Change-Id: Ibd469600959aea344e7a59557d986fc673a79727
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46020
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Bryan Bernhart <bryan.bernhart@intel.com>

src/dawn_native/d3d12/D3D12Backend.cpp

diff --git a/src/dawn_native/d3d12/D3D12Backend.cpp b/src/dawn_native/d3d12/D3D12Backend.cpp
index 3975698..5fc2e24 100644
--- a/src/dawn_native/d3d12/D3D12Backend.cpp
+++ b/src/dawn_native/d3d12/D3D12Backend.cpp
@@ -145,23 +145,6 @@
             memorySegment, requestedReservationSize);
     }
 
-    WGPUTexture WrapSharedHandle(WGPUDevice device,
-                                 const ExternalImageDescriptorDXGISharedHandle* descriptor) {
-        std::unique_ptr<ExternalImageDXGI> externalImage =
-            ExternalImageDXGI::Create(device, descriptor);
-        if (externalImage == nullptr) {
-            return nullptr;
-        }
-
-        ExternalImageAccessDescriptorDXGIKeyedMutex externalAccessDesc = {};
-        externalAccessDesc.isInitialized = descriptor->isInitialized;
-        externalAccessDesc.isSwapChainTexture = descriptor->isSwapChainTexture;
-        externalAccessDesc.acquireMutexKey = descriptor->acquireMutexKey;
-        externalAccessDesc.usage = descriptor->cTextureDescriptor->usage;
-
-        return externalImage->ProduceTexture(device, &externalAccessDesc);
-    }
-
     AdapterDiscoveryOptions::AdapterDiscoveryOptions(ComPtr<IDXGIAdapter> adapter)
         : AdapterDiscoveryOptionsBase(WGPUBackendType_D3D12), dxgiAdapter(std::move(adapter)) {
     }

src/include/dawn_native/D3D12Backend.h

diff --git a/src/include/dawn_native/D3D12Backend.h b/src/include/dawn_native/D3D12Backend.h
index e713623..b85a988 100644
--- a/src/include/dawn_native/D3D12Backend.h
+++ b/src/include/dawn_native/D3D12Backend.h
@@ -48,11 +48,8 @@
       public:
         ExternalImageDescriptorDXGISharedHandle();
 
+        // Note: SharedHandle must be a handle to a texture object.
         HANDLE sharedHandle;
-
-        // Warning: depreciated, replaced by ExternalImageAccessDescriptorDXGIKeyedMutex.
-        uint64_t acquireMutexKey;
-        bool isSwapChainTexture = false;
     };
 
     struct DAWN_NATIVE_EXPORT ExternalImageAccessDescriptorDXGIKeyedMutex
@@ -88,11 +85,6 @@
         uint32_t mSampleCount;
     };
 
-    // Warning: depreciated, replaced by ExternalImageDXGI::Create.
-    // Note: SharedHandle must be a handle to a texture object.
-    DAWN_NATIVE_EXPORT WGPUTexture
-    WrapSharedHandle(WGPUDevice device, const ExternalImageDescriptorDXGISharedHandle* descriptor);
-
     struct DAWN_NATIVE_EXPORT AdapterDiscoveryOptions : public AdapterDiscoveryOptionsBase {
         AdapterDiscoveryOptions(Microsoft::WRL::ComPtr<IDXGIAdapter> adapter);