Changeset 285868 in webkit

Timestamp:

Nov 16, 2021, 9:11:23 AM (5 years ago)

Author:

mmaxfield@apple.com

Message:

[WebGPU] Vertex and fragment shaders are not hooked up to pipeline creation
​https://bugs.webkit.org/show_bug.cgi?id=233166

Reviewed by Dean Jackson.

I simply forgot to implement them in r285831.

• pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp:

(PAL::WebGPU::supportedLimits):

• pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp:

(PAL::WebGPU::convertToBacking):

Location:

trunk/Source/WebCore/PAL

Files:

• ChangeLog (modified) (1 diff)
• pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp (modified) (1 diff)
• pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp (modified) (7 diffs)
• pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h (modified) (1 diff)
• pal/graphics/WebGPU/Impl/WebGPURenderBundleEncoderImpl.h (modified) (1 diff)
• pal/graphics/WebGPU/Impl/WebGPURenderPassEncoderImpl.h (modified) (1 diff)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-11-16  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WebGPU] Vertex and fragment shaders are not hooked up to pipeline creation
+        https://bugs.webkit.org/show_bug.cgi?id=233166
+
+        Reviewed by Dean Jackson.
+
+        I simply forgot to implement them in r285831.
+
+        * pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp:
+        (PAL::WebGPU::supportedLimits):
+        * pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp:
+        (PAL::WebGPU::convertToBacking):
+
 2021-11-15  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp

@@ -90 +90 @@
 {
     WGPUSupportedLimits limits;
-    wgpuAdapterGetLimits(adapter, &limits);
+    limits.nextInChain = nullptr;
+    auto result = wgpuAdapterGetLimits(adapter, &limits);
+    ASSERT_UNUSED(result, result);
     return SupportedLimits::create(
         limits.limits.maxTextureDimension1D,

trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp

@@ -236 +236 @@
     auto label = descriptor.label.utf8();
 
+    auto source = descriptor.code.utf8();
+
+    WGPUShaderModuleWGSLDescriptor backingWGSLDescriptor {
+        {
+            nullptr,
+            WGPUSType_ShaderModuleWGSLDescriptor,
+        },
+        source.data(),
+    };
+
     WGPUShaderModuleDescriptor backingDescriptor {
-        nullptr,
+        &backingWGSLDescriptor.chain,
         label.data(),
     };
@@ -251 +261 @@
     auto entryPoint = descriptor.compute.entryPoint.utf8();
 
-    Vector<CString> keys;
-    keys.reserveInitialCapacity(descriptor.compute.constants.size());
+    Vector<CString> constantNames;
+    constantNames.reserveInitialCapacity(descriptor.compute.constants.size());
     for (const auto& constant : descriptor.compute.constants)
-        keys.uncheckedAppend(constant.key.utf8());
+        constantNames.uncheckedAppend(constant.key.utf8());
 
     Vector<WGPUConstantEntry> backingConstantEntries;
@@ -262 +272 @@
         backingConstantEntries.uncheckedAppend(WGPUConstantEntry {
             nullptr,
-            keys[i].data(),
+            constantNames[i].data(),
             constant.value
         });
@@ -293 +303 @@
 {
     auto label = descriptor.label.utf8();
+
+    auto vertexEntryPoint = descriptor.vertex.entryPoint.utf8();
+
+    Vector<CString> vertexConstantNames;
+    vertexConstantNames.reserveInitialCapacity(descriptor.vertex.constants.size());
+    for (const auto& constant : descriptor.vertex.constants)
+        vertexConstantNames.uncheckedAppend(constant.key.utf8());
+
+    Vector<WGPUConstantEntry> vertexConstantEntries;
+    vertexConstantEntries.reserveInitialCapacity(descriptor.vertex.constants.size());
+    for (size_t i = 0; i < descriptor.vertex.constants.size(); ++i) {
+        const auto& constant = descriptor.vertex.constants[i];
+        vertexConstantEntries.uncheckedAppend(WGPUConstantEntry {
+            nullptr,
+            vertexConstantNames[i].data(),
+            constant.value,
+        });
+    }
 
     Vector<Vector<WGPUVertexAttribute>> backingAttributes;
@@ -345 +373 @@
         descriptor.depthStencil ? descriptor.depthStencil->depthBiasClamp : 0,
     };
+
+    auto fragmentEntryPoint = descriptor.fragment ? descriptor.fragment->entryPoint.utf8() : CString("");
+
+    Vector<CString> fragmentConstantNames;
+    if (descriptor.fragment) {
+        fragmentConstantNames.reserveInitialCapacity(descriptor.fragment->constants.size());
+        for (const auto& constant : descriptor.fragment->constants)
+            fragmentConstantNames.uncheckedAppend(constant.key.utf8());
+    }
+
+    Vector<WGPUConstantEntry> fragmentConstantEntries;
+    if (descriptor.fragment) {
+        fragmentConstantEntries.reserveInitialCapacity(descriptor.fragment->constants.size());
+        for (size_t i = 0; i < descriptor.fragment->constants.size(); ++i) {
+            const auto& constant = descriptor.fragment->constants[i];
+            fragmentConstantEntries.uncheckedAppend(WGPUConstantEntry {
+                nullptr,
+                fragmentConstantNames[i].data(),
+                constant.value,
+            });
+        }
+    }
 
     Vector<std::optional<WGPUBlendState>> blendStates;
@@ -383 +433 @@
     WGPUFragmentState fragmentState {
         nullptr,
-        nullptr,
-        nullptr,
-        0,
-        nullptr,
+        descriptor.fragment ? convertToBackingContext.convertToBacking(descriptor.fragment->module) : nullptr,
+        fragmentEntryPoint.data(),
+        static_cast<uint32_t>(fragmentConstantEntries.size()),
+        fragmentConstantEntries.data(),
         static_cast<uint32_t>(colorTargets.size()),
         colorTargets.data(),
@@ -396 +446 @@
         descriptor.layout ? convertToBackingContext.convertToBacking(*descriptor.layout) : nullptr, {
             nullptr,
-            nullptr,
-            nullptr,
-            0,
-            nullptr,
+            convertToBackingContext.convertToBacking(descriptor.vertex.module),
+            vertexEntryPoint.data(),
+            static_cast<uint32_t>(vertexConstantEntries.size()),
+            vertexConstantEntries.data(),
             static_cast<uint32_t>(backingBuffers.size()),
             backingBuffers.data(),

trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h

@@ -44 +44 @@
     }
 
-    ~DeviceImpl();
+    virtual ~DeviceImpl();
 
 private:

trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderBundleEncoderImpl.h

@@ -43 +43 @@
     }
 
-    ~RenderBundleEncoderImpl();
+    virtual ~RenderBundleEncoderImpl();
 
 private:

trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderPassEncoderImpl.h

@@ -43 +43 @@
     }
 
-    ~RenderPassEncoderImpl();
+    virtual ~RenderPassEncoderImpl();
 
 private: