[dawn][native] Create DynamicArrayState even for error ResourceTable

This will be used in a future CL to implement the "content timeline"
validation for Update/InsertBinding/RemoveBinding even for error tables.

Bug: 463925499
Change-Id: I019b7ef5481b8ddf51915e16b59e0da69ccdd605
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/280896
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

Author: Kangz

src/dawn/native/Device.cpp

@@ -1452,7 +1452,7 @@ ResourceTableBase* DeviceBase::APICreateResourceTable(const ResourceTableDescrip
     Ref<ResourceTableBase> result;
     if (ConsumedError(CreateResourceTable(descriptor), &result,
                       "calling %s.CreateResourceTable(%s).", this, descriptor)) {
-        result = ResourceTableBase::MakeError(this);
+        result = ResourceTableBase::MakeError(this, descriptor);
     }
     return ReturnToAPI(std::move(result));
 }

src/dawn/native/ResourceTable.cpp

@@ -58,12 +58,23 @@ ResourceTableBase::ResourceTableBase(DeviceBase* device, const ResourceTableDesc
     GetObjectTrackingList()->Track(this);
 }
 
-ResourceTableBase::ResourceTableBase(DeviceBase* device, ObjectBase::ErrorTag tag, StringView label)
-    : ApiObjectBase(device, tag, label), mDestroyed(true) {}
+ResourceTableBase::ResourceTableBase(DeviceBase* device,
+                                     const ResourceTableDescriptor* descriptor,
+                                     ObjectBase::ErrorTag tag)
+    : ApiObjectBase(device, tag, descriptor->label) {
+    // Create a DynamicArrayState even for an error resource table because we need to do state
+    // tracking used for the validation of synchronous errors. However skip creating it for tables
+    // above the limit because that's caught on the content-timeline as well.
+    if (descriptor->size <= device->GetLimits().resourceTableLimits.maxResourceTableSize) {
+        mDynamicArray = AcquireRef(new DynamicArrayState(device, BindingIndex(descriptor->size),
+                                                         wgpu::DynamicBindingKind::SampledTexture));
+    }
+}
 
 // static
-Ref<ResourceTableBase> ResourceTableBase::MakeError(DeviceBase* device, StringView label) {
-    return AcquireRef(new ResourceTableBase(device, ObjectBase::kError, label));
+Ref<ResourceTableBase> ResourceTableBase::MakeError(DeviceBase* device,
+                                                    const ResourceTableDescriptor* descriptor) {
+    return AcquireRef(new ResourceTableBase(device, descriptor, ObjectBase::kError));
 }
 
 ObjectType ResourceTableBase::GetType() const {
@@ -79,19 +90,22 @@ DynamicArrayState* ResourceTableBase::GetDynamicArrayState() {
 }
 
 void ResourceTableBase::DestroyImpl() {
-    if (mDynamicArray) {
+    if (!mDynamicArray->IsDestroyed()) {
         mDynamicArray->Destroy();
     }
-    mDestroyed = true;
 }
 
 void ResourceTableBase::APIDestroy() {
-    Destroy();  // Calls DestroyImpl
+    // Don't just call Destroy() because it skips running on error objects.
+    if (!mDynamicArray->IsDestroyed()) {
+        mDynamicArray->Destroy();
+    }
 }
 
 MaybeError ResourceTableBase::ValidateCanUseInSubmitNow() const {
     DAWN_ASSERT(!IsError());
-    DAWN_INVALID_IF(mDestroyed, "%s used while destroyed.", this);
+    DAWN_ASSERT(mDynamicArray != nullptr);
+    DAWN_INVALID_IF(mDynamicArray->IsDestroyed(), "%s used while destroyed.", this);
     return {};
 }
 

src/dawn/native/ResourceTable.h

@@ -40,7 +40,8 @@ MaybeError ValidateResourceTableDescriptor(const DeviceBase* device,
 
 class ResourceTableBase : public ApiObjectBase {
   public:
-    static Ref<ResourceTableBase> MakeError(DeviceBase* device, StringView label = {});
+    static Ref<ResourceTableBase> MakeError(DeviceBase* device,
+                                            const ResourceTableDescriptor* descriptor);
 
     ObjectType GetType() const override;
 
@@ -58,12 +59,13 @@ class ResourceTableBase : public ApiObjectBase {
     DynamicArrayState* GetDynamicArrayState();
 
   private:
-    ResourceTableBase(DeviceBase* device, ObjectBase::ErrorTag tag, StringView label);
+    ResourceTableBase(DeviceBase* device,
+                      const ResourceTableDescriptor* descriptor,
+                      ObjectBase::ErrorTag tag);
 
     // TODO(https://issues.chromium.org/463925499): Inline the functionality of DynamicArrayState in
     // ResourceTable once bindless bindgroup support is removed.
     Ref<DynamicArrayState> mDynamicArray;
-    bool mDestroyed = false;
 };
 
 }  // namespace dawn::native