commit 77a5f9d999c1453af3ed7d40a234e9d6407c7f6f
author François Beaufort <beaufort.francois@gmail.com> Mon Aug 11 06:07:14 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 11 06:07:14 2025 -0700
tree e8090ad0cf4331007e9ff671933a0fcb9d61d295
parent beef1b126d5458ccedebe00745476e2853dd7135

[dawn][native] Use UnpackedPtr::Has when relevant

This CL has no functional changes.

Change-Id: I5d56cdc623073022027d08bab5ceda33279f80f6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/256894
Commit-Queue: Fr <beaufort.francois@gmail.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn/native/Adapter.cpp

diff --git a/src/dawn/native/Adapter.cpp b/src/dawn/native/Adapter.cpp
index bed358d..1956068 100644
--- a/src/dawn/native/Adapter.cpp
+++ b/src/dawn/native/Adapter.cpp
@@ -129,22 +129,22 @@
     }
 
     bool hadError = false;
-    if (unpacked.Get<AdapterPropertiesMemoryHeaps>() != nullptr &&
+    if (unpacked.Has<AdapterPropertiesMemoryHeaps>() &&
         !mSupportedFeatures.IsEnabled(wgpu::FeatureName::AdapterPropertiesMemoryHeaps)) {
         hadError |= mInstance->ConsumedError(
             DAWN_VALIDATION_ERROR("Feature AdapterPropertiesMemoryHeaps is not available."));
     }
-    if (unpacked.Get<AdapterPropertiesD3D>() != nullptr &&
+    if (unpacked.Has<AdapterPropertiesD3D>() &&
         !mSupportedFeatures.IsEnabled(wgpu::FeatureName::AdapterPropertiesD3D)) {
         hadError |= mInstance->ConsumedError(
             DAWN_VALIDATION_ERROR("Feature AdapterPropertiesD3D is not available."));
     }
-    if (unpacked.Get<AdapterPropertiesVk>() != nullptr &&
+    if (unpacked.Has<AdapterPropertiesVk>() &&
         !mSupportedFeatures.IsEnabled(wgpu::FeatureName::AdapterPropertiesVk)) {
         hadError |= mInstance->ConsumedError(
             DAWN_VALIDATION_ERROR("Feature AdapterPropertiesVk is not available."));
     }
-    if (unpacked.Get<AdapterPropertiesSubgroupMatrixConfigs>() != nullptr &&
+    if (unpacked.Has<AdapterPropertiesSubgroupMatrixConfigs>() &&
         !mSupportedFeatures.IsEnabled(wgpu::FeatureName::ChromiumExperimentalSubgroupMatrix)) {
         hadError |= mInstance->ConsumedError(
             DAWN_VALIDATION_ERROR("Feature ChromiumExperimentalSubgroupMatrix is not available."));

src/dawn/native/Buffer.cpp

diff --git a/src/dawn/native/Buffer.cpp b/src/dawn/native/Buffer.cpp
index 5e672a0..d80acfb 100644
--- a/src/dawn/native/Buffer.cpp
+++ b/src/dawn/native/Buffer.cpp
@@ -346,7 +346,7 @@
       mSize(descriptor->size),
       mUsage(descriptor->usage),
       mInternalUsage(ComputeInternalBufferUsages(device, descriptor->usage, descriptor->size)),
-      mState(descriptor.Get<BufferHostMappedPointer>() ? BufferState::HostMappedPersistent
+      mState(descriptor.Has<BufferHostMappedPointer>() ? BufferState::HostMappedPersistent
                                                        : BufferState::Unmapped) {
     GetObjectTrackingList()->Track(this);
 }

src/dawn/native/Device.cpp

diff --git a/src/dawn/native/Device.cpp b/src/dawn/native/Device.cpp
index 0f07612..a535163 100644
--- a/src/dawn/native/Device.cpp
+++ b/src/dawn/native/Device.cpp
@@ -459,7 +459,7 @@
     mState = State::Alive;
 
     // Fake an error after the creation of a device here for testing.
-    if (descriptor.Get<DawnFakeDeviceInitializeErrorForTesting>() != nullptr) {
+    if (descriptor.Has<DawnFakeDeviceInitializeErrorForTesting>()) {
         return DAWN_INTERNAL_ERROR("DawnFakeDeviceInitialzeErrorForTesting");
     }
 
@@ -1213,7 +1213,7 @@
             descriptor = Unpack(rawDescriptor);
         }
 
-        bool hasHostMapped = descriptor.Get<BufferHostMappedPointer>() != nullptr;
+        bool hasHostMapped = descriptor.Has<BufferHostMappedPointer>();
         bool fakeOOMAtDevice = false;
         if (auto* ext = descriptor.Get<DawnFakeBufferOOMForTesting>()) {
             fakeOOMAtNativeMap = ext->fakeOOMAtNativeMap;
@@ -2183,7 +2183,7 @@
             break;
         }
         case wgpu::SType::ShaderSourceWGSL: {
-            DAWN_INVALID_IF(unpacked.Get<ShaderModuleCompilationOptions>() != nullptr &&
+            DAWN_INVALID_IF(unpacked.Has<ShaderModuleCompilationOptions>() &&
                                 !HasFeature(Feature::ShaderModuleCompilationOptions),
                             "Shader module compilation options used without %s enabled.",
                             wgpu::FeatureName::ShaderModuleCompilationOptions);

src/dawn/native/ShaderModule.cpp

diff --git a/src/dawn/native/ShaderModule.cpp b/src/dawn/native/ShaderModule.cpp
index b351155..6a761b3 100644
--- a/src/dawn/native/ShaderModule.cpp
+++ b/src/dawn/native/ShaderModule.cpp
@@ -1407,7 +1407,7 @@
     }
 #else   // TINT_BUILD_SPV_READER
     // SPIR-V is not enabled, so the descriptor should not contain it.
-    DAWN_ASSERT(shaderModuleDesc.Get<ShaderSourceSPIRV>() == nullptr);
+    DAWN_ASSERT(!shaderModuleDesc.Has<ShaderSourceSPIRV>());
 #endif  // TINT_BUILD_SPV_READER
 
     // Dump WGSL.

src/dawn/native/ShaderModuleParseRequest.cpp

diff --git a/src/dawn/native/ShaderModuleParseRequest.cpp b/src/dawn/native/ShaderModuleParseRequest.cpp
index 5423444..969b494 100644
--- a/src/dawn/native/ShaderModuleParseRequest.cpp
+++ b/src/dawn/native/ShaderModuleParseRequest.cpp
@@ -78,7 +78,7 @@
         DAWN_ASSERT(
             device->GetInstance()->HasFeature(wgpu::InstanceFeatureName::ShaderSourceSPIRV));
         // Descriptor should not contain WGSL part.
-        DAWN_ASSERT(descriptor.Get<ShaderSourceWGSL>() == nullptr);
+        DAWN_ASSERT(!descriptor.Has<ShaderSourceWGSL>());
 
         const auto* spirvOptions = descriptor.Get<DawnShaderModuleSPIRVOptionsDescriptor>();
         DAWN_ASSERT(spirvDesc != nullptr);
@@ -96,7 +96,7 @@
     }
 #else   // TINT_BUILD_SPV_READER
     // SPIR-V is not enabled, so the descriptor should not contain it.
-    DAWN_ASSERT(descriptor.Get<ShaderSourceSPIRV>() == nullptr);
+    DAWN_ASSERT(!descriptor.Has<ShaderSourceSPIRV>());
 #endif  // TINT_BUILD_SPV_READER
 
     // Handling WGSL.