encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add releaseMutexKey to ExternalImageAccessDescriptorDXGIKeyedMutex 

This allows the client to specify a different release key for the keyed
mutex than the default of acquire key + 1. If the release key is the
sentinel value of UINT64_MAX, it's set to acquire key + 1. Once Chromium
transitions to always specifying the release key, it will be made a
required parameter and the default behavior will be removed.

Bug: chromium:1213977
Change-Id: I327f7157bb7ff23cf216e43043568ce7c6f38a60
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/53880
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
This commit is contained in:
Sunny Sachanandani 2021-06-08 21:03:17 +00:00 committed by Dawn LUCI CQ
parent 85acca3e09
commit cabd60d991
6 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,9 +84,16 @@ namespace dawn_native { namespace d3d12 {
textureDescriptor.mipLevelCount = mMipLevelCount;
textureDescriptor.sampleCount = mSampleCount;
// Set the release key to acquire key + 1 if not set. This allows supporting the old keyed
// mutex protocol during the transition to making this a required parameter.
ExternalMutexSerial releaseMutexKey =
(descriptor->releaseMutexKey != UINT64_MAX)
? ExternalMutexSerial(descriptor->releaseMutexKey)
: ExternalMutexSerial(descriptor->acquireMutexKey + 1);
Ref<TextureBase> texture = backendDevice->CreateExternalTexture(
&textureDescriptor, mD3D12Resource, ExternalMutexSerial(descriptor->acquireMutexKey),
descriptor->isSwapChainTexture, descriptor->isInitialized);
releaseMutexKey, descriptor->isSwapChainTexture, descriptor->isInitialized);
return reinterpret_cast<WGPUTexture>(texture.Detach());
}

15
src/dawn_native/d3d12/DeviceD3D12.cpp
View File

@ -453,13 +453,14 @@ namespace dawn_native { namespace d3d12 {
Ref<TextureBase> Device::CreateExternalTexture(const TextureDescriptor* descriptor,
ComPtr<ID3D12Resource> d3d12Texture,
ExternalMutexSerial acquireMutexKey,
ExternalMutexSerial releaseMutexKey,
bool isSwapChainTexture,
bool isInitialized) {
Ref<Texture> dawnTexture;
if (ConsumedError(
Texture::CreateExternalImage(this, descriptor, std::move(d3d12Texture),
acquireMutexKey, isSwapChainTexture, isInitialized),
&dawnTexture)) {
if (ConsumedError(Texture::CreateExternalImage(this, descriptor, std::move(d3d12Texture),
acquireMutexKey, releaseMutexKey,
isSwapChainTexture, isInitialized),
&dawnTexture)) {
return nullptr;
}
return {dawnTexture};
@ -562,9 +563,9 @@ namespace dawn_native { namespace d3d12 {
if (gpu_info::IsIntel(pciInfo.vendorId) &&
(gpu_info::IsSkylake(pciInfo.deviceId) || gpu_info::IsKabylake(pciInfo.deviceId) ||
gpu_info::IsCoffeelake(pciInfo.deviceId))) {
SetToggle(
Toggle::UseTempBufferInSmallFormatTextureToTextureCopyFromGreaterToLessMipLevel,
true);
SetToggle(
Toggle::UseTempBufferInSmallFormatTextureToTextureCopyFromGreaterToLessMipLevel,
true);
}
}

1
src/dawn_native/d3d12/DeviceD3D12.h
View File

@ -125,6 +125,7 @@ namespace dawn_native { namespace d3d12 {
Ref<TextureBase> CreateExternalTexture(const TextureDescriptor* descriptor,
ComPtr<ID3D12Resource> d3d12Texture,
ExternalMutexSerial acquireMutexKey,
ExternalMutexSerial releaseMutexKey,
bool isSwapChainTexture,
bool isInitialized);
ResultOrError<ComPtr<IDXGIKeyedMutex>> CreateKeyedMutexForTexture(

32
src/dawn_native/d3d12/TextureD3D12.cpp
View File

@ -422,12 +422,14 @@ namespace dawn_native { namespace d3d12 {
const TextureDescriptor* descriptor,
ComPtr<ID3D12Resource> d3d12Texture,
ExternalMutexSerial acquireMutexKey,
ExternalMutexSerial releaseMutexKey,
bool isSwapChainTexture,
bool isInitialized) {
Ref<Texture> dawnTexture =
AcquireRef(new Texture(device, descriptor, TextureState::OwnedExternal));
DAWN_TRY(dawnTexture->InitializeAsExternalTexture(descriptor, std::move(d3d12Texture),
acquireMutexKey, isSwapChainTexture));
acquireMutexKey, releaseMutexKey,
isSwapChainTexture));
// Importing a multi-planar format must be initialized. This is required because
// a shared multi-planar format cannot be initialized by Dawn.
@ -454,6 +456,7 @@ namespace dawn_native { namespace d3d12 {
MaybeError Texture::InitializeAsExternalTexture(const TextureDescriptor* descriptor,
ComPtr<ID3D12Resource> d3d12Texture,
ExternalMutexSerial acquireMutexKey,
ExternalMutexSerial releaseMutexKey,
bool isSwapChainTexture) {
Device* dawnDevice = ToBackend(GetDevice());
@ -464,6 +467,7 @@ namespace dawn_native { namespace d3d12 {
"D3D12 acquiring shared mutex"));
mAcquireMutexKey = acquireMutexKey;
mReleaseMutexKey = releaseMutexKey;
mDxgiKeyedMutex = std::move(dxgiKeyedMutex);
mSwapChainTexture = isSwapChainTexture;
@ -528,7 +532,7 @@ namespace dawn_native { namespace d3d12 {
// When creating the ResourceHeapAllocation, the resource heap is set to nullptr because the
// texture is owned externally. The texture's owning entity must remain responsible for
// memory management.
mResourceAllocation = { info, 0, std::move(d3d12Texture), nullptr };
mResourceAllocation = {info, 0, std::move(d3d12Texture), nullptr};
return {};
}
@ -569,7 +573,7 @@ namespace dawn_native { namespace d3d12 {
mSwapChainTexture = false;
if (mDxgiKeyedMutex != nullptr) {
mDxgiKeyedMutex->ReleaseSync(uint64_t(mAcquireMutexKey) + 1);
mDxgiKeyedMutex->ReleaseSync(uint64_t(mReleaseMutexKey));
device->ReleaseKeyedMutexForTexture(std::move(mDxgiKeyedMutex));
}
}
@ -788,18 +792,17 @@ namespace dawn_native { namespace d3d12 {
// This transitions assume it is a 2D texture
ASSERT(GetDimension() == wgpu::TextureDimension::e2D);
mSubresourceStateAndDecay.Merge(
textureUsages, [&](const SubresourceRange& mergeRange, StateAndDecay* state,
wgpu::TextureUsage usage) {
// Skip if this subresource is not used during the current pass
if (usage == wgpu::TextureUsage::None) {
return;
}
mSubresourceStateAndDecay.Merge(textureUsages, [&](const SubresourceRange& mergeRange,
StateAndDecay* state,
wgpu::TextureUsage usage) {
// Skip if this subresource is not used during the current pass
if (usage == wgpu::TextureUsage::None) {
return;
}
D3D12_RESOURCE_STATES newState = D3D12TextureUsage(usage, GetFormat());
TransitionSubresourceRange(barriers, mergeRange, state, newState,
pendingCommandSerial);
});
D3D12_RESOURCE_STATES newState = D3D12TextureUsage(usage, GetFormat());
TransitionSubresourceRange(barriers, mergeRange, state, newState, pendingCommandSerial);
});
}
D3D12_RENDER_TARGET_VIEW_DESC Texture::GetRTVDescriptor(uint32_t mipLevel,
@ -869,7 +872,6 @@ namespace dawn_native { namespace d3d12 {
MaybeError Texture::ClearTexture(CommandRecordingContext* commandContext,
const SubresourceRange& range,
TextureBase::ClearValue clearValue) {
ID3D12GraphicsCommandList* commandList = commandContext->GetCommandList();
Device* device = ToBackend(GetDevice());

3
src/dawn_native/d3d12/TextureD3D12.h
View File

@ -43,6 +43,7 @@ namespace dawn_native { namespace d3d12 {
const TextureDescriptor* descriptor,
ComPtr<ID3D12Resource> d3d12Texture,
ExternalMutexSerial acquireMutexKey,
ExternalMutexSerial releaseMutexKey,
bool isSwapChainTexture,
bool isInitialized);
static ResultOrError<Ref<Texture>> Create(Device* device,
@ -89,6 +90,7 @@ namespace dawn_native { namespace d3d12 {
MaybeError InitializeAsExternalTexture(const TextureDescriptor* descriptor,
ComPtr<ID3D12Resource> d3d12Texture,
ExternalMutexSerial acquireMutexKey,
ExternalMutexSerial releaseMutexKey,
bool isSwapChainTexture);
MaybeError InitializeAsSwapChainTexture(ComPtr<ID3D12Resource> d3d12Texture);
@ -123,6 +125,7 @@ namespace dawn_native { namespace d3d12 {
bool mSwapChainTexture = false;
ExternalMutexSerial mAcquireMutexKey = ExternalMutexSerial(0);
ExternalMutexSerial mReleaseMutexKey = ExternalMutexSerial(0);
ComPtr<IDXGIKeyedMutex> mDxgiKeyedMutex;
};

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

@ -56,6 +56,8 @@ namespace dawn_native { namespace d3d12 {
: ExternalImageAccessDescriptor {
public:
uint64_t acquireMutexKey;
// Release key will be set to acquireMutexKey + 1 if set to sentinel value UINT64_MAX.
uint64_t releaseMutexKey = UINT64_MAX;
bool isSwapChainTexture = false;
};