Changeset 293718 in webkit

Timestamp:

May 3, 2022, 12:47:42 AM (4 years ago)

Author:

mmaxfield@apple.com

Message:

[WebGPU] Device creation should not always fail if supported features are requested
​https://bugs.webkit.org/show_bug.cgi?id=239955

Reviewed by Kimmo Kinnunen.

Somehow a block of code was remaining from before we implemented optional features.

Test: webgpu/api/validation/createTexture

• WebGPU/Adapter.mm:

(WebGPU::Adapter::requestDevice):

• WebGPU/Instance.mm:

(WebGPU::Instance::requestAdapter):

Location:

trunk/Source/WebGPU

Files:

• ChangeLog (modified) (1 diff)
• WebGPU/Adapter.mm (modified) (1 diff)
• WebGPU/Instance.mm (modified) (2 diffs)

trunk/Source/WebGPU/ChangeLog

@@ +1 @@
+2022-05-03  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WebGPU] Device creation should not always fail if supported features are requested
+        https://bugs.webkit.org/show_bug.cgi?id=239955
+
+        Reviewed by Kimmo Kinnunen.
+
+        Somehow a block of code was remaining from before we implemented optional features.
+
+        Test: webgpu/api/validation/createTexture
+
+        * WebGPU/Adapter.mm:
+        (WebGPU::Adapter::requestDevice):
+        * WebGPU/Instance.mm:
+        (WebGPU::Instance::requestAdapter):
+
 2022-05-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebGPU/WebGPU/Adapter.mm

@@ -88 +88 @@
         instance().scheduleWork([strongThis = Ref { *this }, callback = WTFMove(callback)]() mutable {
             callback(WGPURequestDeviceStatus_Error, Device::createInvalid(strongThis), "Unknown descriptor type"_s);
-        });
-        return;
-    }
-
-    if (descriptor.requiredFeaturesCount) {
-        instance().scheduleWork([strongThis = Ref { *this }, callback = WTFMove(callback)]() mutable {
-            callback(WGPURequestDeviceStatus_Error, Device::createInvalid(strongThis), "Device does not support requested features"_s);
         });
         return;

trunk/Source/WebGPU/WebGPU/Instance.mm

@@ -187 +187 @@
     auto device = sortedDevices[0];
 
-    auto deviceCapabilties = hardwareCapabilities(device);
-
-    if (!deviceCapabilties) {
+    auto deviceCapabilities = hardwareCapabilities(device);
+
+    if (!deviceCapabilities) {
         scheduleWork([strongThis = Ref { *this }, callback = WTFMove(callback)]() mutable {
             callback(WGPURequestAdapterStatus_Error, Adapter::createInvalid(strongThis), "Device does not support WebGPU"_s);
@@ -196 +196 @@
     }
 
-    scheduleWork([strongThis = Ref { *this }, device = sortedDevices[0], deviceCapabilties = WTFMove(*deviceCapabilties), callback = WTFMove(callback)]() mutable {
-        callback(WGPURequestAdapterStatus_Success, Adapter::create(device, strongThis, WTFMove(deviceCapabilties)), { });
+    scheduleWork([strongThis = Ref { *this }, device = sortedDevices[0], deviceCapabilities = WTFMove(*deviceCapabilities), callback = WTFMove(callback)]() mutable {
+        callback(WGPURequestAdapterStatus_Success, Adapter::create(device, strongThis, WTFMove(deviceCapabilities)), { });
     });
 }