<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285868] trunk/Source/WebCore/PAL</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285868">285868</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2021-11-16 09:11:23 -0800 (Tue, 16 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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 <a href="http://trac.webkit.org/projects/webkit/changeset/285831">r285831</a>.

* pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp:
(PAL::WebGPU::supportedLimits):
* pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp:
(PAL::WebGPU::convertToBacking):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPUAdapterImplcpp">trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPUDeviceImplcpp">trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPUDeviceImplh">trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h</a></li>
<li><a href="#trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPURenderBundleEncoderImplh">trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderBundleEncoderImpl.h</a></li>
<li><a href="#trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPURenderPassEncoderImplh">trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderPassEncoderImpl.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (285867 => 285868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2021-11-16 17:11:06 UTC (rev 285867)
+++ trunk/Source/WebCore/PAL/ChangeLog  2021-11-16 17:11:23 UTC (rev 285868)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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):
+
</ins><span class="cx"> 2021-11-15  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add another <model> backend backed by SceneKit to prove out ModelPlayer infrastructure a bit more
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPUAdapterImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp (285867 => 285868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp  2021-11-16 17:11:06 UTC (rev 285867)
+++ trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUAdapterImpl.cpp     2021-11-16 17:11:23 UTC (rev 285868)
</span><span class="lines">@@ -89,7 +89,9 @@
</span><span class="cx"> static Ref<SupportedLimits> supportedLimits(WGPUAdapter adapter)
</span><span class="cx"> {
</span><span class="cx">     WGPUSupportedLimits limits;
</span><del>-    wgpuAdapterGetLimits(adapter, &limits);
</del><ins>+    limits.nextInChain = nullptr;
+    auto result = wgpuAdapterGetLimits(adapter, &limits);
+    ASSERT_UNUSED(result, result);
</ins><span class="cx">     return SupportedLimits::create(
</span><span class="cx">         limits.limits.maxTextureDimension1D,
</span><span class="cx">         limits.limits.maxTextureDimension2D,
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPUDeviceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp (285867 => 285868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp   2021-11-16 17:11:06 UTC (rev 285867)
+++ trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp      2021-11-16 17:11:23 UTC (rev 285868)
</span><span class="lines">@@ -235,8 +235,18 @@
</span><span class="cx"> {
</span><span class="cx">     auto label = descriptor.label.utf8();
</span><span class="cx"> 
</span><ins>+    auto source = descriptor.code.utf8();
+
+    WGPUShaderModuleWGSLDescriptor backingWGSLDescriptor {
+        {
+            nullptr,
+            WGPUSType_ShaderModuleWGSLDescriptor,
+        },
+        source.data(),
+    };
+
</ins><span class="cx">     WGPUShaderModuleDescriptor backingDescriptor {
</span><del>-        nullptr,
</del><ins>+        &backingWGSLDescriptor.chain,
</ins><span class="cx">         label.data(),
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="lines">@@ -250,10 +260,10 @@
</span><span class="cx"> 
</span><span class="cx">     auto entryPoint = descriptor.compute.entryPoint.utf8();
</span><span class="cx"> 
</span><del>-    Vector<CString> keys;
-    keys.reserveInitialCapacity(descriptor.compute.constants.size());
</del><ins>+    Vector<CString> constantNames;
+    constantNames.reserveInitialCapacity(descriptor.compute.constants.size());
</ins><span class="cx">     for (const auto& constant : descriptor.compute.constants)
</span><del>-        keys.uncheckedAppend(constant.key.utf8());
</del><ins>+        constantNames.uncheckedAppend(constant.key.utf8());
</ins><span class="cx"> 
</span><span class="cx">     Vector<WGPUConstantEntry> backingConstantEntries;
</span><span class="cx">     backingConstantEntries.reserveInitialCapacity(descriptor.compute.constants.size());
</span><span class="lines">@@ -261,7 +271,7 @@
</span><span class="cx">         const auto& constant = descriptor.compute.constants[i];
</span><span class="cx">         backingConstantEntries.uncheckedAppend(WGPUConstantEntry {
</span><span class="cx">             nullptr,
</span><del>-            keys[i].data(),
</del><ins>+            constantNames[i].data(),
</ins><span class="cx">             constant.value
</span><span class="cx">         });
</span><span class="cx">     }
</span><span class="lines">@@ -293,6 +303,24 @@
</span><span class="cx"> {
</span><span class="cx">     auto label = descriptor.label.utf8();
</span><span class="cx"> 
</span><ins>+    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,
+        });
+    }
+
</ins><span class="cx">     Vector<Vector<WGPUVertexAttribute>> backingAttributes;
</span><span class="cx">     backingAttributes.reserveInitialCapacity(descriptor.vertex.buffers.size());
</span><span class="cx">     for (const auto& buffer : descriptor.vertex.buffers) {
</span><span class="lines">@@ -345,6 +373,28 @@
</span><span class="cx">         descriptor.depthStencil ? descriptor.depthStencil->depthBiasClamp : 0,
</span><span class="cx">     };
</span><span class="cx"> 
</span><ins>+    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,
+            });
+        }
+    }
+
</ins><span class="cx">     Vector<std::optional<WGPUBlendState>> blendStates;
</span><span class="cx">     if (descriptor.fragment) {
</span><span class="cx">         blendStates.reserveInitialCapacity(descriptor.fragment->targets.size());
</span><span class="lines">@@ -382,10 +432,10 @@
</span><span class="cx"> 
</span><span class="cx">     WGPUFragmentState fragmentState {
</span><span class="cx">         nullptr,
</span><del>-        nullptr,
-        nullptr,
-        0,
-        nullptr,
</del><ins>+        descriptor.fragment ? convertToBackingContext.convertToBacking(descriptor.fragment->module) : nullptr,
+        fragmentEntryPoint.data(),
+        static_cast<uint32_t>(fragmentConstantEntries.size()),
+        fragmentConstantEntries.data(),
</ins><span class="cx">         static_cast<uint32_t>(colorTargets.size()),
</span><span class="cx">         colorTargets.data(),
</span><span class="cx">     };
</span><span class="lines">@@ -395,10 +445,10 @@
</span><span class="cx">         label.data(),
</span><span class="cx">         descriptor.layout ? convertToBackingContext.convertToBacking(*descriptor.layout) : nullptr, {
</span><span class="cx">             nullptr,
</span><del>-            nullptr,
-            nullptr,
-            0,
-            nullptr,
</del><ins>+            convertToBackingContext.convertToBacking(descriptor.vertex.module),
+            vertexEntryPoint.data(),
+            static_cast<uint32_t>(vertexConstantEntries.size()),
+            vertexConstantEntries.data(),
</ins><span class="cx">             static_cast<uint32_t>(backingBuffers.size()),
</span><span class="cx">             backingBuffers.data(),
</span><span class="cx">         }, {
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPUDeviceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h (285867 => 285868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h     2021-11-16 17:11:06 UTC (rev 285867)
+++ trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h        2021-11-16 17:11:23 UTC (rev 285868)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">         return adoptRef(*new DeviceImpl(device, WTFMove(features), WTFMove(limits), convertToBackingContext));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ~DeviceImpl();
</del><ins>+    virtual ~DeviceImpl();
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     friend class DowncastConvertToBackingContext;
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPURenderBundleEncoderImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderBundleEncoderImpl.h (285867 => 285868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderBundleEncoderImpl.h        2021-11-16 17:11:06 UTC (rev 285867)
+++ trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderBundleEncoderImpl.h   2021-11-16 17:11:23 UTC (rev 285868)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">         return adoptRef(*new RenderBundleEncoderImpl(renderBundleEncoder, convertToBackingContext));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ~RenderBundleEncoderImpl();
</del><ins>+    virtual ~RenderBundleEncoderImpl();
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     friend class DowncastConvertToBackingContext;
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalgraphicsWebGPUImplWebGPURenderPassEncoderImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderPassEncoderImpl.h (285867 => 285868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderPassEncoderImpl.h  2021-11-16 17:11:06 UTC (rev 285867)
+++ trunk/Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPURenderPassEncoderImpl.h     2021-11-16 17:11:23 UTC (rev 285868)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">         return adoptRef(*new RenderPassEncoderImpl(renderPassEncoder, convertToBackingContext));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ~RenderPassEncoderImpl();
</del><ins>+    virtual ~RenderPassEncoderImpl();
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     friend class DowncastConvertToBackingContext;
</span></span></pre>
</div>
</div>

</body>
</html>