Changeset 294373 in webkit

Timestamp:

May 17, 2022, 6:09:07 PM (4 years ago)

Author:

mmaxfield@apple.com

Message:

[WebGPU] Work around ​https://bugs.webkit.org/show_bug.cgi?id=240219
​https://bugs.webkit.org/show_bug.cgi?id=240441

​https://bugs.webkit.org/show_bug.cgi?id=240219 is about a bug where we can't
say "optional thingy = 0" in an IDL file. This patch works around that in WebGPU
by replacing it with "optional thingy" and then "thingy.value_or(0)" in the C++
code. This is temporary, until ​https://bugs.webkit.org/show_bug.cgi?id=240219 is
fixed.

No new tests because there is no behavior change.

• Modules/WebGPU/GPUBuffer.cpp:

(WebCore::GPUBuffer::mapAsync):
(WebCore::GPUBuffer::getMappedRange):

• Modules/WebGPU/GPUBuffer.h:
• Modules/WebGPU/GPUBuffer.idl:

Canonical link: ​https://commits.webkit.org/250668@main

Location:

trunk/Source/WebCore/Modules/WebGPU

Files:

• GPUBuffer.cpp (modified) (1 diff)
• GPUBuffer.h (modified) (1 diff)
• GPUBuffer.idl (modified) (1 diff)

trunk/Source/WebCore/Modules/WebGPU/GPUBuffer.cpp

@@ -39 +39 @@
 }
 
-void GPUBuffer::mapAsync(GPUMapModeFlags mode, GPUSize64 offset, std::optional<GPUSize64> size, MapAsyncPromise&& promise)
+void GPUBuffer::mapAsync(GPUMapModeFlags mode, std::optional<GPUSize64> offset, std::optional<GPUSize64> size, MapAsyncPromise&& promise)
 {
-    m_backing->mapAsync(convertMapModeFlagsToBacking(mode), offset, size, [promise = WTFMove(promise)] () mutable {
+    m_backing->mapAsync(convertMapModeFlagsToBacking(mode), offset.value_or(0), size, [promise = WTFMove(promise)] () mutable {
         promise.resolve(nullptr);
     });
 }
 
-Ref<JSC::ArrayBuffer> GPUBuffer::getMappedRange(GPUSize64 offset, std::optional<GPUSize64> size)
+Ref<JSC::ArrayBuffer> GPUBuffer::getMappedRange(std::optional<GPUSize64> offset, std::optional<GPUSize64> size)
 {
-    auto mappedRange = m_backing->getMappedRange(offset, size);
+    auto mappedRange = m_backing->getMappedRange(offset.value_or(0), size);
     return ArrayBuffer::create(mappedRange.source, mappedRange.byteLength);
 }

trunk/Source/WebCore/Modules/WebGPU/GPUBuffer.h

@@ -50 +50 @@
 
     using MapAsyncPromise = DOMPromiseDeferred<IDLNull>;
-    void mapAsync(GPUMapModeFlags, GPUSize64 offset, std::optional<GPUSize64> sizeForMap, MapAsyncPromise&&);
-    Ref<JSC::ArrayBuffer> getMappedRange(GPUSize64 offset, std::optional<GPUSize64> rangeSize);
+    void mapAsync(GPUMapModeFlags, std::optional<GPUSize64> offset, std::optional<GPUSize64> sizeForMap, MapAsyncPromise&&);
+    Ref<JSC::ArrayBuffer> getMappedRange(std::optional<GPUSize64> offset, std::optional<GPUSize64> rangeSize);
     void unmap();
 

trunk/Source/WebCore/Modules/WebGPU/GPUBuffer.idl

@@ -36 +36 @@
 ]
 interface GPUBuffer {
-    Promise<undefined> mapAsync(GPUMapModeFlags mode, optional GPUSize64 offset = 0, optional GPUSize64 size);
-    ArrayBuffer getMappedRange(optional GPUSize64 offset = 0, optional GPUSize64 size);
+    // FIXME: https://bugs.webkit.org/show_bug.cgi?id=240219 The next two lines should be able to say "optional thingy = 0" instead of just "optional thingy".
+    Promise<undefined> mapAsync(GPUMapModeFlags mode, optional GPUSize64 offset, optional GPUSize64 size);
+    ArrayBuffer getMappedRange(optional GPUSize64 offset, optional GPUSize64 size);
     undefined unmap();