encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-05-17 12:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

D3D12: Remove WrapSharedHandle

Browse Source 
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>
This commit is contained in:
Bryan Bernhart 2021-03-25 21:31:34 +00:00 committed by Commit Bot service account
parent d9b56a02c5
commit 1a232448d2
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dawn_native/d3d12/D3D12Backend.cpp
View File

@ -145,23 +145,6 @@ namespace dawn_native { namespace d3d12 {
memorySegment, requestedReservationSize); 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) AdapterDiscoveryOptions::AdapterDiscoveryOptions(ComPtr<IDXGIAdapter> adapter)
: AdapterDiscoveryOptionsBase(WGPUBackendType_D3D12), dxgiAdapter(std::move(adapter)) { : AdapterDiscoveryOptionsBase(WGPUBackendType_D3D12), dxgiAdapter(std::move(adapter)) {
} }

10
src/include/dawn_native/D3D12Backend.h
View File

@ -48,11 +48,8 @@ namespace dawn_native { namespace d3d12 {
public: public:
ExternalImageDescriptorDXGISharedHandle(); ExternalImageDescriptorDXGISharedHandle();
// Note: SharedHandle must be a handle to a texture object.
HANDLE sharedHandle; HANDLE sharedHandle;
// Warning: depreciated, replaced by ExternalImageAccessDescriptorDXGIKeyedMutex.
uint64_t acquireMutexKey;
bool isSwapChainTexture = false;
}; };
struct DAWN_NATIVE_EXPORT ExternalImageAccessDescriptorDXGIKeyedMutex struct DAWN_NATIVE_EXPORT ExternalImageAccessDescriptorDXGIKeyedMutex
@ -88,11 +85,6 @@ namespace dawn_native { namespace d3d12 {
uint32_t mSampleCount; 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 { struct DAWN_NATIVE_EXPORT AdapterDiscoveryOptions : public AdapterDiscoveryOptionsBase {
AdapterDiscoveryOptions(Microsoft::WRL::ComPtr<IDXGIAdapter> adapter); AdapterDiscoveryOptions(Microsoft::WRL::ComPtr<IDXGIAdapter> adapter);