diff --git a/include/dawn/native/DawnNative.h b/include/dawn/native/DawnNative.h index 39b6fe121e..477c57de29 100644 --- a/include/dawn/native/DawnNative.h +++ b/include/dawn/native/DawnNative.h @@ -180,9 +180,6 @@ class DAWN_NATIVE_EXPORT Instance { // Enable / disable the adapter blocklist. void EnableAdapterBlocklist(bool enable); - // TODO(dawn:1374) Deprecate this once it is passed via the descriptor. - void SetPlatform(dawn::platform::Platform* platform); - uint64_t GetDeviceCountForTesting() const; // Returns the underlying WGPUInstance object. diff --git a/src/dawn/native/DawnNative.cpp b/src/dawn/native/DawnNative.cpp index d5514e25ef..2de16e74f8 100644 --- a/src/dawn/native/DawnNative.cpp +++ b/src/dawn/native/DawnNative.cpp @@ -205,11 +205,6 @@ void Instance::EnableAdapterBlocklist(bool enable) { mImpl->EnableAdapterBlocklist(enable); } -// TODO(dawn:1374) Deprecate this once it is passed via the descriptor. -void Instance::SetPlatform(dawn::platform::Platform* platform) { - mImpl->SetPlatform(platform); -} - uint64_t Instance::GetDeviceCountForTesting() const { return mImpl->GetDeviceCountForTesting(); } diff --git a/src/dawn/native/Instance.h b/src/dawn/native/Instance.h index c943ddee45..b149e6d98d 100644 --- a/src/dawn/native/Instance.h +++ b/src/dawn/native/Instance.h @@ -99,9 +99,7 @@ class InstanceBase final : public RefCountedWithExternalCount { void EnableAdapterBlocklist(bool enable); bool IsAdapterBlocklistEnabled() const; - // TODO(dawn:1374): SetPlatform should become a private helper, and SetPlatformForTesting - // will become the NOT thread-safe testing version exposed for special testing cases. - void SetPlatform(dawn::platform::Platform* platform); + // Testing only API that is NOT thread-safe. void SetPlatformForTesting(dawn::platform::Platform* platform); dawn::platform::Platform* GetPlatform(); BlobCache* GetBlobCache(bool enabled = true); @@ -131,6 +129,7 @@ class InstanceBase final : public RefCountedWithExternalCount { InstanceBase& operator=(const InstanceBase& other) = delete; MaybeError Initialize(const InstanceDescriptor* descriptor); + void SetPlatform(dawn::platform::Platform* platform); // Lazily creates connections to all backends that have been compiled. void EnsureBackendConnection(wgpu::BackendType backendType);