[dawn][d3d11] Remove STMD3D11Texture2DDescriptor::requiresEndAccessFence It has been deprecated for a while, and is no longer used. Bug: 335003893 Change-Id: Ic39111915287356e730088171d8681c1538786cc Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/266995 Reviewed-by: Loko Kung <lokokung@google.com> Reviewed-by: Quyen Le <lehoangquyen@chromium.org> Commit-Queue: Quyen Le <lehoangquyen@chromium.org> Auto-Submit: Corentin Wallez <cwallez@chromium.org>
diff --git a/include/dawn/native/D3D11Backend.h b/include/dawn/native/D3D11Backend.h index 415b97e..29d9156 100644 --- a/include/dawn/native/D3D11Backend.h +++ b/include/dawn/native/D3D11Backend.h
@@ -58,18 +58,6 @@ // This ID3D11Texture2D object must be created from the same ID3D11Device used in the // WGPUDevice. Microsoft::WRL::ComPtr<ID3D11Texture2D> texture; - - // If this flag is true, Dawn is required to signal a fence before EndAccess() and return it in - // SharedTextureMemoryEndAccessState's fences list. - // If it's false, no fence signaling is needed and EndAccess() might return empty fence list. - // Notes: - // - This flag is not relevant if the feature SharedFenceDXGISharedHandle is disabled/not - // supported. - // - This flag if present will override the requiresEndAccessFence flag in - // SharedTextureMemoryD3D11BeginState - // TODO(chromium:335003893): This flag is deprecated. Remove it once clients are updated to use - // SharedTextureMemoryD3D11BeginState's requiresEndAccessFence. - std::optional<bool> requiresEndAccessFence; }; } // namespace dawn::native::d3d11
diff --git a/src/dawn/native/d3d11/SharedTextureMemoryD3D11.cpp b/src/dawn/native/d3d11/SharedTextureMemoryD3D11.cpp index 4c7f775..ad113d8 100644 --- a/src/dawn/native/d3d11/SharedTextureMemoryD3D11.cpp +++ b/src/dawn/native/d3d11/SharedTextureMemoryD3D11.cpp
@@ -135,8 +135,7 @@ /*isSharedWithHandle=*/true)); auto result = - AcquireRef(new SharedTextureMemory(device, label, properties, std::move(d3d11Resource), - /*requiresFenceSignalOverride=*/std::nullopt)); + AcquireRef(new SharedTextureMemory(device, label, properties, std::move(d3d11Resource))); result->Initialize(); return result; } @@ -162,9 +161,8 @@ DAWN_TRY_ASSIGN(properties, PropertiesFromD3D11Texture(device, descriptor->texture, /*isSharedWithHandle=*/false)); - auto result = AcquireRef(new SharedTextureMemory( - device, label, properties, std::move(d3d11Resource), - /*requiresFenceSignalOverride=*/descriptor->requiresEndAccessFence)); + auto result = + AcquireRef(new SharedTextureMemory(device, label, properties, std::move(d3d11Resource))); result->Initialize(); return result; } @@ -172,11 +170,8 @@ SharedTextureMemory::SharedTextureMemory(Device* device, StringView label, SharedTextureMemoryProperties properties, - ComPtr<ID3D11Resource> resource, - std::optional<bool> requiresFenceSignalOverride) - : d3d::SharedTextureMemory(device, label, properties), - mResource(std::move(resource)), - mRequiresFenceSignalOverride(std::move(requiresFenceSignalOverride)) { + ComPtr<ID3D11Resource> resource) + : d3d::SharedTextureMemory(device, label, properties), mResource(std::move(resource)) { ComPtr<IDXGIKeyedMutex> dxgiKeyedMutex; mResource.As(&dxgiKeyedMutex); if (dxgiKeyedMutex) { @@ -213,9 +208,7 @@ auto* contents = static_cast<SharedTextureMemoryContentsD3D11*>(GetContents()); - if (mRequiresFenceSignalOverride) { - contents->mRequiresFenceSignal = *mRequiresFenceSignalOverride; - } else if (auto* d3d11beginState = descriptor.Get<SharedTextureMemoryD3D11BeginState>()) { + if (auto* d3d11beginState = descriptor.Get<SharedTextureMemoryD3D11BeginState>()) { contents->mRequiresFenceSignal |= d3d11beginState->requiresEndAccessFence; } else { // If there is no SharedTextureMemoryD3D11BeginState, default to true
diff --git a/src/dawn/native/d3d11/SharedTextureMemoryD3D11.h b/src/dawn/native/d3d11/SharedTextureMemoryD3D11.h index da5a37e..b20cd6c 100644 --- a/src/dawn/native/d3d11/SharedTextureMemoryD3D11.h +++ b/src/dawn/native/d3d11/SharedTextureMemoryD3D11.h
@@ -77,8 +77,7 @@ SharedTextureMemory(Device* device, StringView label, SharedTextureMemoryProperties properties, - ComPtr<ID3D11Resource> resource, - std::optional<bool> requiresFenceSignalOverride = std::nullopt); + ComPtr<ID3D11Resource> resource); void DestroyImpl() override; @@ -96,12 +95,8 @@ ComPtr<ID3D11Resource> mResource; Ref<d3d::KeyedMutex> mKeyedMutex; - - // Flag indicates whether we need to signal a fence after accessing this texture or not. - // TODO(chromium:335003893): This flag is deprecated. Remove it once clients are updated to use - // SharedTextureMemoryD3D11BeginState's requiresEndAccessFence. - const std::optional<bool> mRequiresFenceSignalOverride; }; + } // namespace d3d11 } // namespace dawn::native