Allow device lost callback to be passed at creation
This change updates the Device descriptor to allow a device lost
callback to be passed in at device creation time. This will be
important for allowing the API to return devices which have
already been lost in a future CL, which is the behavior required
by the spec.
This change does not yet deprecate the old method for setting the
callback, as there's still some tricky scenarios that will need to
be worked around to enable that and this CL is already fairly
large. (The uses in question pass the device or a value created
from the device as the userdata.)
Bug: chromium:1234617
Change-Id: I1adea5ceffdfdcfedff9fff4960f12303abba29c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/121041
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Brandon Jones <bajones@chromium.org>
diff --git a/dawn.json b/dawn.json
index 218ff9f..5a21cfa 100644
--- a/dawn.json
+++ b/dawn.json
@@ -163,7 +163,9 @@
{"name": "required features count", "type": "uint32_t", "default": 0},
{"name": "required features", "type": "feature name", "annotation": "const*", "length": "required features count", "default": "nullptr"},
{"name": "required limits", "type": "required limits", "annotation": "const*", "optional": true},
- {"name": "default queue", "type": "queue descriptor"}
+ {"name": "default queue", "type": "queue descriptor"},
+ {"name": "device lost callback", "type": "device lost callback", "default": "nullptr"},
+ {"name": "device lost userdata", "type": "void *", "default": "nullptr"}
]
},
"dawn toggles descriptor": {
@@ -1191,6 +1193,7 @@
{
"name": "set device lost callback",
"no autolock": true,
+ "tags": ["deprecated"],
"args": [
{"name": "callback", "type": "device lost callback"},
{"name": "userdata", "type": "void", "annotation": "*"}
diff --git a/generator/templates/api.h b/generator/templates/api.h
index c4def22..bf220e7 100644
--- a/generator/templates/api.h
+++ b/generator/templates/api.h
@@ -65,6 +65,11 @@
typedef struct {{as_cType(type.name)}}Impl* {{as_cType(type.name)}};
{% endfor %}
+// Structure forward declarations
+{% for type in by_category["structure"] %}
+ struct {{as_cType(type.name)}};
+{% endfor %}
+
{% for type in by_category["enum"] + by_category["bitmask"] %}
typedef enum {{as_cType(type.name)}} {
{% for value in type.values %}
@@ -78,6 +83,18 @@
{% endfor -%}
+{% for type in by_category["function pointer"] %}
+ typedef {{as_cType(type.return_type.name)}} (*{{as_cType(type.name)}})(
+ {%- if type.arguments == [] -%}
+ void
+ {%- else -%}
+ {%- for arg in type.arguments -%}
+ {% if not loop.first %}, {% endif %}{% if arg.type.category == "structure" %}struct {% endif %}{{as_annotated_cType(arg)}}
+ {%- endfor -%}
+ {%- endif -%}
+ );
+{% endfor %}
+
typedef struct {{c_prefix}}ChainedStruct {
struct {{c_prefix}}ChainedStruct const * next;
{{c_prefix}}SType sType;
diff --git a/src/dawn/native/Device.cpp b/src/dawn/native/Device.cpp
index 80a8ba0..011242e 100644
--- a/src/dawn/native/Device.cpp
+++ b/src/dawn/native/Device.cpp
@@ -176,6 +176,9 @@
: mAdapter(adapter), mToggles(deviceToggles), mNextPipelineCompatibilityToken(1) {
ASSERT(descriptor != nullptr);
+ mDeviceLostCallback = descriptor->deviceLostCallback;
+ mDeviceLostUserdata = descriptor->deviceLostUserdata;
+
AdapterProperties adapterProperties;
adapter->APIGetProperties(&adapterProperties);
@@ -234,15 +237,17 @@
}
};
- mDeviceLostCallback = [](WGPUDeviceLostReason, char const*, void*) {
- static bool calledOnce = false;
- if (!calledOnce) {
- calledOnce = true;
- dawn::WarningLog() << "No Dawn device lost callback was set. This is probably not "
- "intended. If you really want to ignore device lost "
- "and suppress this message, set the callback to null.";
- }
- };
+ if (!mDeviceLostCallback) {
+ mDeviceLostCallback = [](WGPUDeviceLostReason, char const*, void*) {
+ static bool calledOnce = false;
+ if (!calledOnce) {
+ calledOnce = true;
+ dawn::WarningLog() << "No Dawn device lost callback was set. This is probably not "
+ "intended. If you really want to ignore device lost "
+ "and suppress this message, set the callback to null.";
+ }
+ };
+ }
#endif // DAWN_ENABLE_ASSERTS
mCaches = std::make_unique<DeviceBase::Caches>();
@@ -611,6 +616,8 @@
}
void DeviceBase::APISetDeviceLostCallback(wgpu::DeviceLostCallback callback, void* userdata) {
+ // TODO(chromium:1234617): Add a deprecation warning.
+
// The registered callback function and userdata pointer are stored and used by deferred
// callback tasks, and after setting a different callback (especially in the case of
// resetting) the resources pointed by such pointer may be freed. Flush all deferred
diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp
index e153d25..0b8f1ba 100644
--- a/src/dawn/tests/DawnTest.cpp
+++ b/src/dawn/tests/DawnTest.cpp
@@ -699,7 +699,7 @@
callback(WGPURequestAdapterStatus_Success, cAdapter, nullptr, userdata);
};
- procs.adapterRequestDevice = [](WGPUAdapter adapter, const WGPUDeviceDescriptor*,
+ procs.adapterRequestDevice = [](WGPUAdapter adapter, const WGPUDeviceDescriptor* descriptor,
WGPURequestDeviceCallback callback, void* userdata) {
ASSERT(gCurrentTest);
@@ -711,7 +711,7 @@
isolationKey = std::move(gCurrentTest->mNextIsolationKeyQueue.front());
gCurrentTest->mNextIsolationKeyQueue.pop();
}
- WGPUDevice cDevice = gCurrentTest->CreateDeviceImpl(std::move(isolationKey));
+ WGPUDevice cDevice = gCurrentTest->CreateDeviceImpl(std::move(isolationKey), descriptor);
ASSERT(cDevice != nullptr);
gCurrentTest->mLastCreatedBackendDevice = cDevice;
@@ -978,7 +978,12 @@
return true;
}
-WGPUDevice DawnTestBase::CreateDeviceImpl(std::string isolationKey) {
+void* DawnTestBase::GetUniqueUserdata() {
+ return reinterpret_cast<void*>(++mNextUniqueUserdata);
+}
+
+WGPUDevice DawnTestBase::CreateDeviceImpl(std::string isolationKey,
+ const WGPUDeviceDescriptor* descriptor) {
// Create the device from the adapter
std::vector<wgpu::FeatureName> requiredFeatures = GetRequiredFeatures();
if (IsImplicitDeviceSyncEnabled()) {
@@ -989,7 +994,8 @@
mBackendAdapter.GetLimits(reinterpret_cast<WGPUSupportedLimits*>(&supportedLimits));
wgpu::RequiredLimits requiredLimits = GetRequiredLimits(supportedLimits);
- wgpu::DeviceDescriptor deviceDescriptor = {};
+ wgpu::DeviceDescriptor deviceDescriptor =
+ *reinterpret_cast<const wgpu::DeviceDescriptor*>(descriptor);
deviceDescriptor.requiredLimits = &requiredLimits;
deviceDescriptor.requiredFeatures = requiredFeatures.data();
deviceDescriptor.requiredFeaturesCount = requiredFeatures.size();
@@ -1017,6 +1023,12 @@
// Give an empty descriptor.
// TODO(dawn:1684): Replace empty DeviceDescriptor with nullptr after Dawn wire support it.
wgpu::DeviceDescriptor deviceDesc = {};
+
+ // Set up the mocks for device loss.
+ void* deviceUserdata = GetUniqueUserdata();
+ deviceDesc.deviceLostCallback = mDeviceLostCallback.Callback();
+ deviceDesc.deviceLostUserdata = mDeviceLostCallback.MakeUserdata(deviceUserdata);
+
mAdapter.RequestDevice(
&deviceDesc,
[](WGPURequestDeviceStatus, WGPUDevice cDevice, const char*, void* userdata) {
@@ -1026,14 +1038,13 @@
FlushWire();
ASSERT(apiDevice);
- // Set up the mocks for uncaptured errors and device loss. The loss of the device is
- // expected to happen at the end of the test so at it directly.
+ // Set up the mocks for uncaptured errors.
apiDevice.SetUncapturedErrorCallback(mDeviceErrorCallback.Callback(),
mDeviceErrorCallback.MakeUserdata(apiDevice.Get()));
- apiDevice.SetDeviceLostCallback(mDeviceLostCallback.Callback(),
- mDeviceLostCallback.MakeUserdata(apiDevice.Get()));
+
+ // The loss of the device is expected to happen at the end of the test so at it directly.
EXPECT_CALL(mDeviceLostCallback,
- Call(WGPUDeviceLostReason_Destroyed, testing::_, apiDevice.Get()))
+ Call(WGPUDeviceLostReason_Destroyed, testing::_, deviceUserdata))
.Times(testing::AtMost(1));
apiDevice.SetLoggingCallback(
@@ -1123,8 +1134,7 @@
resolvedDevice = this->device;
}
- EXPECT_CALL(mDeviceLostCallback,
- Call(WGPUDeviceLostReason_Undefined, testing::_, resolvedDevice.Get()))
+ EXPECT_CALL(mDeviceLostCallback, Call(WGPUDeviceLostReason_Undefined, testing::_, testing::_))
.Times(1);
resolvedDevice.ForceLoss(wgpu::DeviceLostReason::Undefined, "Device lost for testing");
resolvedDevice.Tick();
diff --git a/src/dawn/tests/DawnTest.h b/src/dawn/tests/DawnTest.h
index 9804d36..e763659 100644
--- a/src/dawn/tests/DawnTest.h
+++ b/src/dawn/tests/DawnTest.h
@@ -580,6 +580,8 @@
wgpu::SupportedLimits GetAdapterLimits();
wgpu::SupportedLimits GetSupportedLimits();
+ void* GetUniqueUserdata();
+
private:
utils::ScopedAutoreleasePool mObjCAutoreleasePool;
AdapterTestParam mParam;
@@ -587,12 +589,15 @@
wgpu::Instance mInstance;
wgpu::Adapter mAdapter;
+ // Helps generate unique userdata values passed to deviceLostUserdata.
+ std::atomic<uintptr_t> mNextUniqueUserdata = 0;
+
// Isolation keys are not exposed to the wire client. Device creation in the tests from
// the client first push the key into this queue, which is then consumed by the server.
std::queue<std::string> mNextIsolationKeyQueue;
// Internal device creation function for default device creation with some optional overrides.
- WGPUDevice CreateDeviceImpl(std::string isolationKey);
+ WGPUDevice CreateDeviceImpl(std::string isolationKey, const WGPUDeviceDescriptor* descriptor);
std::ostringstream& AddTextureExpectationImpl(const char* file,
int line,
diff --git a/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp b/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp
index 93b638b..f093cf7 100644
--- a/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp
@@ -79,8 +79,8 @@
return desc;
}
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::Depth32FloatStencil8};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/CopyCommandsValidationTests.cpp b/src/dawn/tests/unittests/validation/CopyCommandsValidationTests.cpp
index 7aedf2f..b2eafe8 100644
--- a/src/dawn/tests/unittests/validation/CopyCommandsValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/CopyCommandsValidationTests.cpp
@@ -420,8 +420,8 @@
class CopyCommandTest_B2T : public CopyCommandTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::Depth32FloatStencil8};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -1028,8 +1028,8 @@
class CopyCommandTest_T2B : public CopyCommandTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::Depth32FloatStencil8};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -1665,8 +1665,8 @@
class CopyCommandTest_T2T : public CopyCommandTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::Depth32FloatStencil8};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -2144,8 +2144,8 @@
class CopyCommandTest_CompressedTextureFormats : public CopyCommandTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[3] = {wgpu::FeatureName::TextureCompressionBC,
wgpu::FeatureName::TextureCompressionETC2,
wgpu::FeatureName::TextureCompressionASTC};
diff --git a/src/dawn/tests/unittests/validation/CopyTextureForBrowserTests.cpp b/src/dawn/tests/unittests/validation/CopyTextureForBrowserTests.cpp
index 6c677db..1c3ab63 100644
--- a/src/dawn/tests/unittests/validation/CopyTextureForBrowserTests.cpp
+++ b/src/dawn/tests/unittests/validation/CopyTextureForBrowserTests.cpp
@@ -101,8 +101,8 @@
class CopyTextureForBrowserInternalUsageTest : public CopyTextureForBrowserTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName feature = wgpu::FeatureName::DawnInternalUsages;
descriptor.requiredFeatures = &feature;
descriptor.requiredFeaturesCount = 1;
@@ -142,8 +142,8 @@
class CopyExternalTextureForBrowserInternalUsageTest : public CopyExternalTextureForBrowserTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName feature = wgpu::FeatureName::DawnInternalUsages;
descriptor.requiredFeatures = &feature;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/InternalUsageValidationTests.cpp b/src/dawn/tests/unittests/validation/InternalUsageValidationTests.cpp
index 0283e25..e4d82d3 100644
--- a/src/dawn/tests/unittests/validation/InternalUsageValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/InternalUsageValidationTests.cpp
@@ -64,8 +64,8 @@
}
class TextureInternalUsageValidationTest : public ValidationTest {
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::DawnInternalUsages};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/OverridableConstantsValidationTests.cpp b/src/dawn/tests/unittests/validation/OverridableConstantsValidationTests.cpp
index 77b4c81..dd80de0 100644
--- a/src/dawn/tests/unittests/validation/OverridableConstantsValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/OverridableConstantsValidationTests.cpp
@@ -21,7 +21,8 @@
class ComputePipelineOverridableConstantsValidationTest : public ValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor deviceDescriptor) override {
std::vector<const char*> enabledToggles;
std::vector<const char*> disabledToggles;
@@ -35,7 +36,6 @@
const wgpu::FeatureName requiredFeatures[] = {wgpu::FeatureName::ShaderF16};
- wgpu::DeviceDescriptor deviceDescriptor;
deviceDescriptor.nextInChain = &deviceTogglesDesc;
deviceDescriptor.requiredFeatures = requiredFeatures;
deviceDescriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/QueryValidationTests.cpp b/src/dawn/tests/unittests/validation/QueryValidationTests.cpp
index c0ae9de..108ef48 100644
--- a/src/dawn/tests/unittests/validation/QueryValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/QueryValidationTests.cpp
@@ -273,8 +273,8 @@
class TimestampQueryValidationTest : public QuerySetValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::TimestampQuery};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -566,8 +566,8 @@
class TimestampQueryInsidePassesValidationTest : public QuerySetValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
// The timestamp query feature must be supported if the timestamp query inside passes
// feature is supported. Enable timestamp query for validating queries overwrite inside and
// outside of the passes.
@@ -709,11 +709,11 @@
class PipelineStatisticsQueryValidationTest : public QuerySetValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
// Create a device with pipeline statistic query feature required. Note that Pipeline
// statistic query is an unsafe API, while AllowUnsafeApis instance toggle is enabled
// when ValidationTest creating testing instance, so we can test it.
- wgpu::DeviceDescriptor descriptor;
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::PipelineStatisticsQuery};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/QueueWriteTextureValidationTests.cpp b/src/dawn/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
index 9829ab3..fd42e34 100644
--- a/src/dawn/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
@@ -536,8 +536,8 @@
class WriteTextureTest_CompressedTextureFormats : public QueueWriteTextureValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[3] = {wgpu::FeatureName::TextureCompressionBC,
wgpu::FeatureName::TextureCompressionETC2,
wgpu::FeatureName::TextureCompressionASTC};
diff --git a/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp b/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp
index ef23896..4e339b6 100644
--- a/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp
@@ -24,8 +24,8 @@
class RenderPipelineValidationTest : public ValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::ShaderF16};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -1595,8 +1595,8 @@
class DepthClipControlValidationTest : public RenderPipelineValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::DepthClipControl};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -1894,8 +1894,8 @@
class RenderPipelineTransientAttachmentValidationTest : public RenderPipelineValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[2] = {wgpu::FeatureName::ShaderF16,
wgpu::FeatureName::TransientAttachments};
descriptor.requiredFeatures = requiredFeatures;
diff --git a/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp b/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp
index 4e8688e..b8b1ee1 100644
--- a/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp
@@ -269,8 +269,8 @@
class BGRA8UnormStorageTextureInShaderValidationTests : public StorageTextureValidationTests {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::BGRA8UnormStorage};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -427,8 +427,8 @@
class BGRA8UnormStorageBindGroupLayoutTest : public StorageTextureValidationTests {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::BGRA8UnormStorage};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/TextureValidationTests.cpp b/src/dawn/tests/unittests/validation/TextureValidationTests.cpp
index 96364a6..3d3d4ae 100644
--- a/src/dawn/tests/unittests/validation/TextureValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/TextureValidationTests.cpp
@@ -699,8 +699,8 @@
class D32S8TextureFormatsValidationTests : public TextureValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::Depth32FloatStencil8};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -721,8 +721,8 @@
class CompressedTextureFormatsValidationTests : public TextureValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[3] = {wgpu::FeatureName::TextureCompressionBC,
wgpu::FeatureName::TextureCompressionETC2,
wgpu::FeatureName::TextureCompressionASTC};
@@ -879,8 +879,8 @@
class RG11B10UfloatTextureFormatsValidationTests : public TextureValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::RG11B10UfloatRenderable};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -902,8 +902,8 @@
class BGRA8UnormTextureFormatsValidationTests : public TextureValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::BGRA8UnormStorage};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
@@ -1038,8 +1038,8 @@
class TransientAttachmentValidationTest : public TextureValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::TransientAttachments};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/TextureViewValidationTests.cpp b/src/dawn/tests/unittests/validation/TextureViewValidationTests.cpp
index 81aeb3b..e7eefaa 100644
--- a/src/dawn/tests/unittests/validation/TextureViewValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/TextureViewValidationTests.cpp
@@ -916,8 +916,8 @@
class D32S8TextureViewValidationTests : public ValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::Depth32FloatStencil8};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/tests/unittests/validation/UnsafeAPIValidationTests.cpp b/src/dawn/tests/unittests/validation/UnsafeAPIValidationTests.cpp
index f0335ec..a74dca7 100644
--- a/src/dawn/tests/unittests/validation/UnsafeAPIValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/UnsafeAPIValidationTests.cpp
@@ -28,10 +28,10 @@
protected:
// UnsafeAPIValidationTest create the device with the AllowUnsafeAPIs toggle explicitly
// disabled, which overrides the inheritance.
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
// Disable the AllowUnsafeAPIs toggles in device toggles descriptor to override the
// inheritance and create a device disallowing unsafe apis.
- wgpu::DeviceDescriptor descriptor;
wgpu::DawnTogglesDescriptor deviceTogglesDesc;
descriptor.nextInChain = &deviceTogglesDesc;
const char* toggle = "allow_unsafe_apis";
diff --git a/src/dawn/tests/unittests/validation/ValidationTest.cpp b/src/dawn/tests/unittests/validation/ValidationTest.cpp
index 2c21dc7..9d73841 100644
--- a/src/dawn/tests/unittests/validation/ValidationTest.cpp
+++ b/src/dawn/tests/unittests/validation/ValidationTest.cpp
@@ -111,11 +111,14 @@
UNREACHABLE();
};
- procs.adapterRequestDevice = [](WGPUAdapter adapter, const WGPUDeviceDescriptor*,
+ procs.adapterRequestDevice = [](WGPUAdapter adapter, const WGPUDeviceDescriptor* descriptor,
WGPURequestDeviceCallback callback, void* userdata) {
ASSERT(gCurrentTest);
+ wgpu::DeviceDescriptor deviceDesc =
+ *(reinterpret_cast<const wgpu::DeviceDescriptor*>(descriptor));
WGPUDevice cDevice = gCurrentTest->CreateTestDevice(
- dawn::native::Adapter(reinterpret_cast<dawn::native::AdapterBase*>(adapter)));
+ dawn::native::Adapter(reinterpret_cast<dawn::native::AdapterBase*>(adapter)),
+ deviceDesc);
ASSERT(cDevice != nullptr);
gCurrentTest->mLastCreatedBackendDevice = cDevice;
callback(WGPURequestDeviceStatus_Success, cDevice, nullptr, userdata);
@@ -160,11 +163,14 @@
FlushWire();
ASSERT(adapter);
- device = RequestDeviceSync(wgpu::DeviceDescriptor{});
+ wgpu::DeviceDescriptor deviceDescriptor = {};
+ deviceDescriptor.deviceLostCallback = ValidationTest::OnDeviceLost;
+ deviceDescriptor.deviceLostUserdata = this;
+
+ device = RequestDeviceSync(deviceDescriptor);
backendDevice = mLastCreatedBackendDevice;
device.SetUncapturedErrorCallback(ValidationTest::OnDeviceError, this);
- device.SetDeviceLostCallback(ValidationTest::OnDeviceLost, this);
}
ValidationTest::~ValidationTest() {
@@ -281,7 +287,8 @@
return mBackendAdapter;
}
-WGPUDevice ValidationTest::CreateTestDevice(dawn::native::Adapter dawnAdapter) {
+WGPUDevice ValidationTest::CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor deviceDescriptor) {
std::vector<const char*> enabledToggles;
std::vector<const char*> disabledToggles;
@@ -293,7 +300,6 @@
disabledToggles.push_back(toggle.c_str());
}
- wgpu::DeviceDescriptor deviceDescriptor;
wgpu::DawnTogglesDescriptor deviceTogglesDesc;
deviceDescriptor.nextInChain = &deviceTogglesDesc;
diff --git a/src/dawn/tests/unittests/validation/ValidationTest.h b/src/dawn/tests/unittests/validation/ValidationTest.h
index 0d5049f..9586134 100644
--- a/src/dawn/tests/unittests/validation/ValidationTest.h
+++ b/src/dawn/tests/unittests/validation/ValidationTest.h
@@ -135,7 +135,8 @@
protected:
dawn::native::Adapter& GetBackendAdapter();
- virtual WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter);
+ virtual WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor);
wgpu::Device RequestDeviceSync(const wgpu::DeviceDescriptor& deviceDesc);
diff --git a/src/dawn/tests/unittests/validation/VideoViewsValidationTests.cpp b/src/dawn/tests/unittests/validation/VideoViewsValidationTests.cpp
index e566958..d1d6585 100644
--- a/src/dawn/tests/unittests/validation/VideoViewsValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/VideoViewsValidationTests.cpp
@@ -21,8 +21,8 @@
class VideoViewsValidation : public ValidationTest {
protected:
- WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter) override {
- wgpu::DeviceDescriptor descriptor;
+ WGPUDevice CreateTestDevice(dawn::native::Adapter dawnAdapter,
+ wgpu::DeviceDescriptor descriptor) override {
wgpu::FeatureName requiredFeatures[1] = {wgpu::FeatureName::DawnMultiPlanarFormats};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 1;
diff --git a/src/dawn/wire/client/Adapter.cpp b/src/dawn/wire/client/Adapter.cpp
index becca1c..9b8bfa3 100644
--- a/src/dawn/wire/client/Adapter.cpp
+++ b/src/dawn/wire/client/Adapter.cpp
@@ -71,7 +71,7 @@
return;
}
- Device* device = client->Make<Device>();
+ Device* device = client->Make<Device>(descriptor);
uint64_t serial = mRequestDeviceRequests.Add({callback, device->GetWireId(), userdata});
AdapterRequestDeviceCmd cmd;
diff --git a/src/dawn/wire/client/Client.cpp b/src/dawn/wire/client/Client.cpp
index 57f3c57..1c5222d 100644
--- a/src/dawn/wire/client/Client.cpp
+++ b/src/dawn/wire/client/Client.cpp
@@ -106,7 +106,7 @@
}
ReservedDevice Client::ReserveDevice() {
- Device* device = Make<Device>();
+ Device* device = Make<Device>(nullptr);
ReservedDevice result;
result.device = ToAPI(device);
diff --git a/src/dawn/wire/client/Device.cpp b/src/dawn/wire/client/Device.cpp
index 74d6d90..badee9c1 100644
--- a/src/dawn/wire/client/Device.cpp
+++ b/src/dawn/wire/client/Device.cpp
@@ -23,8 +23,13 @@
namespace dawn::wire::client {
-Device::Device(const ObjectBaseParams& params)
+Device::Device(const ObjectBaseParams& params, const WGPUDeviceDescriptor* descriptor)
: ObjectBase(params), mIsAlive(std::make_shared<bool>()) {
+ if (descriptor && descriptor->deviceLostCallback) {
+ mDeviceLostCallback = descriptor->deviceLostCallback;
+ mDeviceLostUserdata = descriptor->deviceLostUserdata;
+ }
+
#if defined(DAWN_ENABLE_ASSERTS)
mErrorCallback = [](WGPUErrorType, char const*, void*) {
static bool calledOnce = false;
@@ -36,15 +41,17 @@
}
};
- mDeviceLostCallback = [](WGPUDeviceLostReason, char const*, void*) {
- static bool calledOnce = false;
- if (!calledOnce) {
- calledOnce = true;
- dawn::WarningLog() << "No Dawn device lost callback was set. This is probably not "
- "intended. If you really want to ignore device lost "
- "and suppress this message, set the callback to null.";
- }
- };
+ if (!mDeviceLostCallback) {
+ mDeviceLostCallback = [](WGPUDeviceLostReason, char const*, void*) {
+ static bool calledOnce = false;
+ if (!calledOnce) {
+ calledOnce = true;
+ dawn::WarningLog() << "No Dawn device lost callback was set. This is probably not "
+ "intended. If you really want to ignore device lost "
+ "and suppress this message, set the callback to null.";
+ }
+ };
+ }
#endif // DAWN_ENABLE_ASSERTS
}
diff --git a/src/dawn/wire/client/Device.h b/src/dawn/wire/client/Device.h
index 2a75249..ecc73b0 100644
--- a/src/dawn/wire/client/Device.h
+++ b/src/dawn/wire/client/Device.h
@@ -32,7 +32,7 @@
class Device final : public ObjectBase {
public:
- explicit Device(const ObjectBaseParams& params);
+ explicit Device(const ObjectBaseParams& params, const WGPUDeviceDescriptor* descriptor);
~Device() override;
void SetUncapturedErrorCallback(WGPUErrorCallback errorCallback, void* errorUserdata);
