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

Remove dawn_native::DeviceDescriptor typedef

Browse Source 
Bug: dawn:160, dawn:689
Change-Id: I9ec5f2056ac70c4150e6555291045690ee295403
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/70582
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2021-12-14 22:35:35 +00:00 committed by Dawn LUCI CQ
parent f296710f64
commit 0e6f443359
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/dawn_native/DawnNative.h
View File

@ -70,10 +70,6 @@ namespace dawn_native {
const WGPURequiredLimits* requiredLimits = nullptr; 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 // 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 // can be manually configured to run or not outside Dawn, including workarounds, special
// features and optimizations. // features and optimizations.

6
src/tests/unittests/validation/CopyCommandsValidationTests.cpp
View File

@ -419,7 +419,7 @@ TEST_F(CopyCommandTest_B2B, CopyWithinSameBuffer) {
class CopyCommandTest_B2T : public CopyCommandTest { class CopyCommandTest_B2T : public CopyCommandTest {
protected: protected:
WGPUDevice CreateTestDevice() override { WGPUDevice CreateTestDevice() override {
dawn_native::DeviceDescriptor descriptor; dawn_native::DawnDeviceDescriptor descriptor;
descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"}; descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"};
return adapter.CreateDevice(&descriptor); return adapter.CreateDevice(&descriptor);
} }
@ -1000,7 +1000,7 @@ TEST_F(CopyCommandTest_B2T, RequiredBytesInCopyOverflow) {
class CopyCommandTest_T2B : public CopyCommandTest { class CopyCommandTest_T2B : public CopyCommandTest {
protected: protected:
WGPUDevice CreateTestDevice() override { WGPUDevice CreateTestDevice() override {
dawn_native::DeviceDescriptor descriptor; dawn_native::DawnDeviceDescriptor descriptor;
descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"}; descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"};
return adapter.CreateDevice(&descriptor); return adapter.CreateDevice(&descriptor);
} }
@ -1633,7 +1633,7 @@ TEST_F(CopyCommandTest_T2B, RequiredBytesInCopyOverflow) {
class CopyCommandTest_T2T : public CopyCommandTest { class CopyCommandTest_T2T : public CopyCommandTest {
protected: protected:
WGPUDevice CreateTestDevice() override { WGPUDevice CreateTestDevice() override {
dawn_native::DeviceDescriptor descriptor; dawn_native::DawnDeviceDescriptor descriptor;
descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"}; descriptor.requiredFeatures = {"depth24unorm-stencil8", "depth32float-stencil8"};
return adapter.CreateDevice(&descriptor); return adapter.CreateDevice(&descriptor);
} }

4
src/tests/unittests/validation/TextureValidationTests.cpp
View File

@ -597,7 +597,7 @@ namespace {
class D24S8TextureFormatsValidationTests : public TextureValidationTest { class D24S8TextureFormatsValidationTests : public TextureValidationTest {
protected: protected:
WGPUDevice CreateTestDevice() override { WGPUDevice CreateTestDevice() override {
dawn_native::DeviceDescriptor descriptor; dawn_native::DawnDeviceDescriptor descriptor;
descriptor.requiredFeatures = {"depth24unorm-stencil8"}; descriptor.requiredFeatures = {"depth24unorm-stencil8"};
return adapter.CreateDevice(&descriptor); return adapter.CreateDevice(&descriptor);
} }
@ -617,7 +617,7 @@ namespace {
class D32S8TextureFormatsValidationTests : public TextureValidationTest { class D32S8TextureFormatsValidationTests : public TextureValidationTest {
protected: protected:
WGPUDevice CreateTestDevice() override { WGPUDevice CreateTestDevice() override {
dawn_native::DeviceDescriptor descriptor; dawn_native::DawnDeviceDescriptor descriptor;
descriptor.requiredFeatures = {"depth32float-stencil8"}; descriptor.requiredFeatures = {"depth32float-stencil8"};
return adapter.CreateDevice(&descriptor); return adapter.CreateDevice(&descriptor);
} }

4
src/tests/unittests/validation/TextureViewValidationTests.cpp
View File

@ -652,7 +652,7 @@ namespace {
class D24S8TextureViewValidationTests : public ValidationTest { class D24S8TextureViewValidationTests : public ValidationTest {
protected: protected:
WGPUDevice CreateTestDevice() override { WGPUDevice CreateTestDevice() override {
dawn_native::DeviceDescriptor descriptor; dawn_native::DawnDeviceDescriptor descriptor;
descriptor.requiredFeatures = {"depth24unorm-stencil8"}; descriptor.requiredFeatures = {"depth24unorm-stencil8"};
return adapter.CreateDevice(&descriptor); return adapter.CreateDevice(&descriptor);
} }
@ -696,7 +696,7 @@ namespace {
class D32S8TextureViewValidationTests : public ValidationTest { class D32S8TextureViewValidationTests : public ValidationTest {
protected: protected:
WGPUDevice CreateTestDevice() override { WGPUDevice CreateTestDevice() override {
dawn_native::DeviceDescriptor descriptor; dawn_native::DawnDeviceDescriptor descriptor;
descriptor.requiredFeatures = {"depth32float-stencil8"}; descriptor.requiredFeatures = {"depth32float-stencil8"};
return adapter.CreateDevice(&descriptor); return adapter.CreateDevice(&descriptor);
} }