diff --git a/src/include/dawn_native/DawnNative.h b/src/include/dawn_native/DawnNative.h index 9382141d03..a73f4f2f6b 100644 --- a/src/include/dawn_native/DawnNative.h +++ b/src/include/dawn_native/DawnNative.h @@ -70,10 +70,6 @@ namespace dawn_native { const WGPURequiredLimits* requiredLimits = nullptr; }; - // TODO(crbug.com/dawn/160): Remove when embedders of Dawn are updated to use - // DawnDeviceDescriptor. - using DeviceDescriptor = DawnDeviceDescriptor; - // A struct to record the information of a toggle. A toggle is a code path in Dawn device that // can be manually configured to run or not outside Dawn, including workarounds, special // features and optimizations. diff --git a/src/tests/unittests/validation/CopyCommandsValidationTests.cpp b/src/tests/unittests/validation/CopyCommandsValidationTests.cpp index ba1b9270b0..63037714da 100644 --- a/src/tests/unittests/validation/CopyCommandsValidationTests.cpp +++ b/src/tests/unittests/validation/CopyCommandsValidationTests.cpp @@ -419,7 +419,7 @@ TEST_F(CopyCommandTest_B2B, CopyWithinSameBuffer) { class CopyCommandTest_B2T : public CopyCommandTest { protected: WGPUDevice CreateTestDevice() override { - dawn_native::DeviceDescriptor descriptor; + dawn_native::DawnDeviceDescriptor descriptor; descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"}; return adapter.CreateDevice(&descriptor); } @@ -1000,7 +1000,7 @@ TEST_F(CopyCommandTest_B2T, RequiredBytesInCopyOverflow) { class CopyCommandTest_T2B : public CopyCommandTest { protected: WGPUDevice CreateTestDevice() override { - dawn_native::DeviceDescriptor descriptor; + dawn_native::DawnDeviceDescriptor descriptor; descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"}; return adapter.CreateDevice(&descriptor); } @@ -1633,7 +1633,7 @@ TEST_F(CopyCommandTest_T2B, RequiredBytesInCopyOverflow) { class CopyCommandTest_T2T : public CopyCommandTest { protected: WGPUDevice CreateTestDevice() override { - dawn_native::DeviceDescriptor descriptor; + dawn_native::DawnDeviceDescriptor descriptor; descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"}; return adapter.CreateDevice(&descriptor); } diff --git a/src/tests/unittests/validation/TextureValidationTests.cpp b/src/tests/unittests/validation/TextureValidationTests.cpp index 9dbf0d058b..053e9f71f6 100644 --- a/src/tests/unittests/validation/TextureValidationTests.cpp +++ b/src/tests/unittests/validation/TextureValidationTests.cpp @@ -597,7 +597,7 @@ namespace { class D24S8TextureFormatsValidationTests : public TextureValidationTest { protected: WGPUDevice CreateTestDevice() override { - dawn_native::DeviceDescriptor descriptor; + dawn_native::DawnDeviceDescriptor descriptor; descriptor.requiredFeatures = {"depth24unorm-stencil8"}; return adapter.CreateDevice(&descriptor); } @@ -617,7 +617,7 @@ namespace { class D32S8TextureFormatsValidationTests : public TextureValidationTest { protected: WGPUDevice CreateTestDevice() override { - dawn_native::DeviceDescriptor descriptor; + dawn_native::DawnDeviceDescriptor descriptor; descriptor.requiredFeatures = {"depth32float-stencil8"}; return adapter.CreateDevice(&descriptor); } diff --git a/src/tests/unittests/validation/TextureViewValidationTests.cpp b/src/tests/unittests/validation/TextureViewValidationTests.cpp index 2583fbaaf8..51c531aec8 100644 --- a/src/tests/unittests/validation/TextureViewValidationTests.cpp +++ b/src/tests/unittests/validation/TextureViewValidationTests.cpp @@ -652,7 +652,7 @@ namespace { class D24S8TextureViewValidationTests : public ValidationTest { protected: WGPUDevice CreateTestDevice() override { - dawn_native::DeviceDescriptor descriptor; + dawn_native::DawnDeviceDescriptor descriptor; descriptor.requiredFeatures = {"depth24unorm-stencil8"}; return adapter.CreateDevice(&descriptor); } @@ -696,7 +696,7 @@ namespace { class D32S8TextureViewValidationTests : public ValidationTest { protected: WGPUDevice CreateTestDevice() override { - dawn_native::DeviceDescriptor descriptor; + dawn_native::DawnDeviceDescriptor descriptor; descriptor.requiredFeatures = {"depth32float-stencil8"}; return adapter.CreateDevice(&descriptor); }