commit 01d91c0571a2692ab9df48b8f463209592d3d0d2
author François Beaufort <beaufort.francois@gmail.com> Wed Dec 11 10:02:00 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Dec 11 10:02:00 2024 +0000
tree 84f0382911bd2408f0b0ed5a83be88104f02b675
parent 0ab4aa4f21f7d363a01d88d034d137c0e6a46cc6

Expand error message if validating maxBufferSize with higher limit

This CLs expands error message when validating buffer descriptor to
indicate when limits are hit that were not provided in the device
requiredLimits.

Bug: 42240683
Change-Id: I81e167c8ff4d0d1cdc8d4bef1a00cec07f208d23
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/217596
Commit-Queue: Fr <beaufort.francois@gmail.com>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>

src/dawn/native/Buffer.cpp

diff --git a/src/dawn/native/Buffer.cpp b/src/dawn/native/Buffer.cpp
index d33fd96..4781e17 100644
--- a/src/dawn/native/Buffer.cpp
+++ b/src/dawn/native/Buffer.cpp
@@ -461,9 +461,13 @@
                     "Buffer is mapped at creation but its size (%u) is not a multiple of 4.",
                     descriptor->size);
 
-    DAWN_INVALID_IF(descriptor->size > device->GetLimits().v1.maxBufferSize,
-                    "Buffer size (%u) exceeds the max buffer size limit (%u).", descriptor->size,
-                    device->GetLimits().v1.maxBufferSize);
+    uint64_t maxBufferSize = device->GetLimits().v1.maxBufferSize;
+    if (DAWN_UNLIKELY(descriptor->size > maxBufferSize)) {
+        return DAWN_VALIDATION_ERROR(
+            "Buffer size (%u) exceeds the max buffer size limit (%u).%s", descriptor->size,
+            maxBufferSize,
+            DAWN_INCREASE_LIMIT_MESSAGE(device->GetAdapter(), maxBufferSize, descriptor->size));
+    }
 
     return unpacked;
 }