<!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>[213782] trunk/Source/WebCore</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/213782">213782</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2017-03-12 23:17:56 -0700 (Sun, 12 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove stubs from WebGPU front end
https://bugs.webkit.org/show_bug.cgi?id=169375
Reviewed by Dean Jackson.
Remove stubs and use the back end.
* html/canvas/WebGPUCommandBuffer.cpp:
* html/canvas/WebGPUCommandBuffer.h:
* html/canvas/WebGPUCommandQueue.cpp:
* html/canvas/WebGPUCommandQueue.h:
* html/canvas/WebGPUDepthStencilDescriptor.cpp:
(WebCore::WebGPUDepthStencilDescriptor::setDepthCompareFunction): Remove redundant clause.
* html/canvas/WebGPUDepthStencilDescriptor.h:
* html/canvas/WebGPUDepthStencilDescriptor.idl: Remove label property. Not needed yet.
* html/canvas/WebGPUDepthStencilState.cpp:
* html/canvas/WebGPUDepthStencilState.h:
* html/canvas/WebGPUEnums.cpp:
* html/canvas/WebGPUEnums.h:
* html/canvas/WebGPURenderCommandEncoder.cpp:
* html/canvas/WebGPURenderCommandEncoder.h:
* html/canvas/WebGPURenderPassAttachmentDescriptor.cpp:
* html/canvas/WebGPURenderPassAttachmentDescriptor.h:
* html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp:
* html/canvas/WebGPURenderPassColorAttachmentDescriptor.h:
* html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp:
* html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h:
* html/canvas/WebGPURenderPassDescriptor.cpp:
(WebCore::WebGPURenderPassDescriptor::colorAttachments): Uncomment code with GPURenderPassColorAttachmentDescriptor available.
* html/canvas/WebGPURenderPassDescriptor.h:
* html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp:
* html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h:
* html/canvas/WebGPURenderPipelineDescriptor.cpp:
* html/canvas/WebGPURenderPipelineDescriptor.h:
* html/canvas/WebGPURenderPipelineDescriptor.idl: Remove label property. Not needed yet.
* html/canvas/WebGPURenderPipelineState.cpp:
* html/canvas/WebGPURenderPipelineState.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUCommandBuffercpp">trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUCommandBufferh">trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUCommandQueuecpp">trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUCommandQueueh">trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUDepthStencilDescriptorcpp">trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUDepthStencilDescriptorh">trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUDepthStencilDescriptoridl">trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUDepthStencilStatecpp">trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUDepthStencilStateh">trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUEnumscpp">trunk/Source/WebCore/html/canvas/WebGPUEnums.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPUEnumsh">trunk/Source/WebCore/html/canvas/WebGPUEnums.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderCommandEncodercpp">trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderCommandEncoderh">trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassAttachmentDescriptorcpp">trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassAttachmentDescriptorh">trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassColorAttachmentDescriptorcpp">trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassColorAttachmentDescriptorh">trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassDepthAttachmentDescriptorcpp">trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassDepthAttachmentDescriptorh">trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassDescriptorcpp">trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPassDescriptorh">trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPipelineColorAttachmentDescriptorcpp">trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPipelineColorAttachmentDescriptorh">trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPipelineDescriptorcpp">trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPipelineDescriptorh">trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPipelineDescriptoridl">trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPipelineStatecpp">trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderPipelineStateh">trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/ChangeLog        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2017-03-12 Jon Lee <jonlee@apple.com>
+
+ Remove stubs from WebGPU front end
+ https://bugs.webkit.org/show_bug.cgi?id=169375
+
+ Reviewed by Dean Jackson.
+
+ Remove stubs and use the back end.
+ * html/canvas/WebGPUCommandBuffer.cpp:
+ * html/canvas/WebGPUCommandBuffer.h:
+ * html/canvas/WebGPUCommandQueue.cpp:
+ * html/canvas/WebGPUCommandQueue.h:
+ * html/canvas/WebGPUDepthStencilDescriptor.cpp:
+ (WebCore::WebGPUDepthStencilDescriptor::setDepthCompareFunction): Remove redundant clause.
+ * html/canvas/WebGPUDepthStencilDescriptor.h:
+ * html/canvas/WebGPUDepthStencilDescriptor.idl: Remove label property. Not needed yet.
+ * html/canvas/WebGPUDepthStencilState.cpp:
+ * html/canvas/WebGPUDepthStencilState.h:
+ * html/canvas/WebGPUEnums.cpp:
+ * html/canvas/WebGPUEnums.h:
+ * html/canvas/WebGPURenderCommandEncoder.cpp:
+ * html/canvas/WebGPURenderCommandEncoder.h:
+ * html/canvas/WebGPURenderPassAttachmentDescriptor.cpp:
+ * html/canvas/WebGPURenderPassAttachmentDescriptor.h:
+ * html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp:
+ * html/canvas/WebGPURenderPassColorAttachmentDescriptor.h:
+ * html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp:
+ * html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h:
+ * html/canvas/WebGPURenderPassDescriptor.cpp:
+ (WebCore::WebGPURenderPassDescriptor::colorAttachments): Uncomment code with GPURenderPassColorAttachmentDescriptor available.
+ * html/canvas/WebGPURenderPassDescriptor.h:
+ * html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp:
+ * html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h:
+ * html/canvas/WebGPURenderPipelineDescriptor.cpp:
+ * html/canvas/WebGPURenderPipelineDescriptor.h:
+ * html/canvas/WebGPURenderPipelineDescriptor.idl: Remove label property. Not needed yet.
+ * html/canvas/WebGPURenderPipelineState.cpp:
+ * html/canvas/WebGPURenderPipelineState.h:
+
</ins><span class="cx"> 2017-03-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGPU Backend
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUCommandBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,10 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPUCommandBuffer.h"
</span><span class="cx"> #include "GPUCommandQueue.h"
</span><del>-*/
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "WebGPUCommandQueue.h"
</span><span class="cx"> #include "WebGPUDrawable.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUCommandBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -33,18 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPUCommandBuffer;
-class GPUDrawable;
-class GPURenderCommandEncoder;
-class GPURenderPassDescriptor;
-class GPUCommandBuffer : public RefCounted<GPUCommandBuffer> {
-public:
- GPURenderCommandEncoder* createRenderCommandEncoder(GPURenderPassDescriptor*) { return nullptr; }
- void commit() { }
- void presentDrawable(GPUDrawable*) { }
-};
-// FIXME: WebGPU - End stub.
</del><ins>+class GPUCommandBuffer;
</ins><span class="cx"> class WebGPUCommandQueue;
</span><span class="cx"> class WebGPUDrawable;
</span><span class="cx"> class WebGPUFunction;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUCommandQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPUCommandQueue.h"
</span><del>-*/
</del><span class="cx"> #include "WebGPUCommandBuffer.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUCommandQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -34,17 +34,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class GPUCommandBuffer;
</span><del>-
-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPUCommandQueue;
-class GPUCommandQueue : public RefCounted<GPUCommandQueue> {
-public:
- GPUCommandBuffer* createCommandBuffer() { return nullptr; }
- String label() const { return emptyString(); }
- void setLabel(const String&) { }
-};
-// FIXME: WebGPU - End stub.
-
</del><ins>+class GPUCommandQueue;
</ins><span class="cx"> class WebGPUCommandBuffer;
</span><span class="cx">
</span><span class="cx"> class WebGPUCommandQueue : public WebGPUObject {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUDepthStencilDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPUDepthStencilDescriptor.h"
</span><del>-*/
</del><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -50,22 +48,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebGPUDepthStencilDescriptor::label() const
-{
- if (!m_depthStencilDescriptor)
- return emptyString();
-
- return m_depthStencilDescriptor->label();
-}
-
-void WebGPUDepthStencilDescriptor::setLabel(const String& label)
-{
- if (!m_depthStencilDescriptor)
- return;
-
- m_depthStencilDescriptor->setLabel(label);
-}
-
</del><span class="cx"> bool WebGPUDepthStencilDescriptor::depthWriteEnabled() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_depthStencilDescriptor)
</span><span class="lines">@@ -91,12 +73,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_depthCompareFunction = newDepthCompareFunction;
</span><span class="cx"> m_depthStencilDescriptor->setDepthCompareFunction(toGPUCompareFunction(m_depthCompareFunction));
</span><del>-
-// FIXME: WebGPU - not implemented yet.
-// if (Optional<WebGPUCompareFunction> compareFunction = toWebGPUCompareFunction(newDepthCompareFunction)) {
-// m_depthCompareFunction = compareFunction.value();
-// m_depthStencilDescriptor->setDepthCompareFunction(toGPUCompareFunction(m_depthCompareFunction));
-// }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUDepthStencilDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -34,18 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPUDepthStencilDescriptor;
-class GPUDepthStencilDescriptor : public RefCounted<GPUDepthStencilDescriptor> {
-public:
- static RefPtr<GPUDepthStencilDescriptor> create() { return nullptr; }
- String label() const { return emptyString(); }
- void setLabel(const String&) { }
- bool depthWriteEnabled() const { return false; }
- void setDepthWriteEnabled(bool) { }
- void setDepthCompareFunction(GPUCompareFunction) { }
-};
-// FIXME: WebGPU - End stub.
</del><ins>+class GPUDepthStencilDescriptor;
</ins><span class="cx">
</span><span class="cx"> class WebGPUDepthStencilDescriptor : public WebGPUObject {
</span><span class="cx"> public:
</span><span class="lines">@@ -52,9 +41,6 @@
</span><span class="cx"> virtual ~WebGPUDepthStencilDescriptor();
</span><span class="cx"> static Ref<WebGPUDepthStencilDescriptor> create();
</span><span class="cx">
</span><del>- String label() const;
- void setLabel(const String&);
-
</del><span class="cx"> bool depthWriteEnabled() const;
</span><span class="cx"> void setDepthWriteEnabled(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUDepthStencilDescriptoridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> EnabledAtRuntime=WebGPU
</span><span class="cx"> ] interface WebGPUDepthStencilDescriptor {
</span><span class="cx">
</span><del>- attribute DOMString label;
-
</del><span class="cx"> attribute WebGPUCompareFunction depthCompareFunction;
</span><span class="cx"> attribute boolean depthWriteEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUDepthStencilStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPUDepthStencilState.h"
</span><del>- */
</del><span class="cx"> #include "WebGPUDepthStencilDescriptor.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUDepthStencilStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -33,17 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPUDepthStencilState;
-class GPUDevice;
-class GPUDepthStencilDescriptor;
-class GPUDepthStencilState : public RefCounted<GPUDepthStencilState> {
-public:
- static RefPtr<GPUDepthStencilState> create(GPUDevice*, GPUDepthStencilDescriptor*) { return nullptr; }
- String label() const { return emptyString(); }
- void setLabel(const String&) { }
-};
-// FIXME: WebGPU - End stub.
</del><ins>+class GPUDepthStencilState;
</ins><span class="cx"> class WebGPUDepthStencilDescriptor;
</span><span class="cx">
</span><span class="cx"> class WebGPUDepthStencilState : public WebGPUObject {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUEnumscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUEnums.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUEnums.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUEnums.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPUEnums.h"
</span><del>- */
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPUEnumsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPUEnums.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPUEnums.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPUEnums.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+enum class GPUCompareFunction;
+
</ins><span class="cx"> enum class WebGPUCompareFunction {
</span><span class="cx"> Never,
</span><span class="cx"> Less,
</span><span class="lines">@@ -45,20 +47,6 @@
</span><span class="cx">
</span><span class="cx"> std::optional<WebGPUCompareFunction> toWebGPUCompareFunction(const String&);
</span><span class="cx"> String web3DCompareFunctionName(const WebGPUCompareFunction);
</span><del>-
-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// enum class GPUCompareFunction;
-enum class GPUCompareFunction {
- Never,
- Less,
- Equal,
- LessEqual,
- Greater,
- NotEqual,
- GreaterEqual,
- Always
-};
-// FIXME: WebGPU - End stub.
</del><span class="cx"> GPUCompareFunction toGPUCompareFunction(const WebGPUCompareFunction);
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderCommandEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,11 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPUCommandBuffer.h"
</span><span class="cx"> #include "GPURenderCommandEncoder.h"
</span><span class="cx"> #include "GPURenderPassDescriptor.h"
</span><del>-*/
</del><span class="cx"> #include "WebGPUBuffer.h"
</span><span class="cx"> #include "WebGPUCommandBuffer.h"
</span><span class="cx"> #include "WebGPUDepthStencilState.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderCommandEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -33,21 +33,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderCommandEncoder;
</del><ins>+class GPURenderCommandEncoder;
</ins><span class="cx"> class GPUBuffer;
</span><span class="cx"> class GPURenderPipelineState;
</span><span class="cx"> class GPUDepthStencilState;
</span><del>-class GPURenderCommandEncoder : public RefCounted<GPURenderCommandEncoder> {
-public:
- void setRenderPipelineState(GPURenderPipelineState*) { }
- void setDepthStencilState(GPUDepthStencilState*) { }
- void setVertexBuffer(GPUBuffer*, unsigned, unsigned) { }
- void setFragmentBuffer(GPUBuffer*, unsigned, unsigned) { }
- void drawPrimitives(unsigned, unsigned, unsigned) { }
- void endEncoding() { }
-};
-// FIXME: WebGPU - End stub.
</del><span class="cx"> class WebGPUCommandBuffer;
</span><span class="cx"> class WebGPUDepthStencilState;
</span><span class="cx"> class WebGPURenderPassDescriptor;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassAttachmentDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPURenderPassAttachmentDescriptor.h"
</span><del>- */
</del><span class="cx"> #include "GPUTexture.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx"> #include "WebGPUTexture.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassAttachmentDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -33,17 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderPassAttachmentDescriptor;
-class GPURenderPassAttachmentDescriptor : public RefCounted<GPURenderPassAttachmentDescriptor> {
-public:
- unsigned long loadAction() const { return 0; }
- void setLoadAction(unsigned long) { }
- unsigned long storeAction() const { return 0; }
- void setStoreAction(unsigned long) { }
- void setTexture(GPUTexture*) { }
-};
-// FIXME: WebGPU - End stub.
</del><ins>+class GPURenderPassAttachmentDescriptor;
</ins><span class="cx"> class WebGPUTexture;
</span><span class="cx">
</span><span class="cx"> class WebGPURenderPassAttachmentDescriptor : public WebGPUObject {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassColorAttachmentDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPURenderPassColorAttachmentDescriptor.h"
</span><del>- */
</del><span class="cx"> #include "GPUTexture.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx"> #include "WebGPUTexture.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassColorAttachmentDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -34,14 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderPassColorAttachmentDescriptor;
-class GPURenderPassColorAttachmentDescriptor : public GPURenderPassAttachmentDescriptor {
-public:
- Vector<float> clearColor() const { return Vector<float>(); }
- void setClearColor(const Vector<float>&) { }
-};
-// FIXME: WebGPU - End stub.
</del><ins>+class GPURenderPassColorAttachmentDescriptor;
</ins><span class="cx">
</span><span class="cx"> class WebGPURenderPassColorAttachmentDescriptor : public WebGPURenderPassAttachmentDescriptor {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassDepthAttachmentDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPURenderPassDepthAttachmentDescriptor.h"
</span><del>- */
</del><span class="cx"> #include "GPUTexture.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx"> #include "WebGPUTexture.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassDepthAttachmentDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -32,14 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderPassDepthAttachmentDescriptor;
-class GPURenderPassDepthAttachmentDescriptor : public GPURenderPassAttachmentDescriptor {
-public:
- double clearDepth() const { return 0; }
- void setClearDepth(double) { }
-};
-// FIXME: WebGPU - End stub.
</del><ins>+class GPURenderPassDepthAttachmentDescriptor;
</ins><span class="cx">
</span><span class="cx"> class WebGPURenderPassDepthAttachmentDescriptor : public WebGPURenderPassAttachmentDescriptor {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,11 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPURenderPassColorAttachmentDescriptor.h"
</span><span class="cx"> #include "GPURenderPassDepthAttachmentDescriptor.h"
</span><span class="cx"> #include "GPURenderPassDescriptor.h"
</span><del>-*/
</del><span class="cx"> #include "WebGPURenderPassColorAttachmentDescriptor.h"
</span><span class="cx"> #include "WebGPURenderPassDepthAttachmentDescriptor.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="lines">@@ -72,10 +70,9 @@
</span><span class="cx"> return Vector<RefPtr<WebGPURenderPassColorAttachmentDescriptor>>();
</span><span class="cx">
</span><span class="cx"> if (!m_colorAttachmentDescriptors.size()) {
</span><del>- // FIXME: WebGPU - GPURenderPassColorAttachmentDescriptor not implemented yet.
- // Vector<RefPtr<GPURenderPassColorAttachmentDescriptor>> platformColorAttachments = m_renderPassDescriptor->colorAttachments();
- // for (auto& attachment : platformColorAttachments)
- // m_colorAttachmentDescriptors.append(WebGPURenderPassColorAttachmentDescriptor::create(this->context(), attachment.get()));
</del><ins>+ Vector<RefPtr<GPURenderPassColorAttachmentDescriptor>> platformColorAttachments = m_renderPassDescriptor->colorAttachments();
+ for (auto& attachment : platformColorAttachments)
+ m_colorAttachmentDescriptors.append(WebGPURenderPassColorAttachmentDescriptor::create(this->context(), attachment.get()));
</ins><span class="cx"> }
</span><span class="cx"> return m_colorAttachmentDescriptors;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPassDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,26 +28,14 @@
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><span class="cx"> #include "WebGPUObject.h"
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "WebGPURenderPassColorAttachmentDescriptor.h"
</span><span class="cx"> #include "WebGPURenderPassDepthAttachmentDescriptor.h"
</span><del>-*/
</del><span class="cx">
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderPassDescriptor;
-class GPURenderPassDepthAttachmentDescriptor;
-class GPURenderPassDescriptor : public RefCounted<GPURenderPassDescriptor> {
-public:
- static RefPtr<GPURenderPassDescriptor> create() { return nullptr; }
- GPURenderPassDepthAttachmentDescriptor* depthAttachment() { return nullptr; }
- // Vector<RefPtr<GPURenderPassColorAttachmentDescriptor>> colorAttachments() { return Vector<RefPtr<GPURenderPassColorAttachmentDescriptor>>(); }
-};
-// FIXME: WebGPU - End stub.
-
</del><ins>+class GPURenderPassDescriptor;
</ins><span class="cx"> class WebGPURenderPassColorAttachmentDescriptor;
</span><span class="cx"> class WebGPURenderPassDepthAttachmentDescriptor;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPipelineColorAttachmentDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPURenderPipelineColorAttachmentDescriptor.h"
</span><del>-*/
</del><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPipelineColorAttachmentDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -32,14 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderPipelineColorAttachmentDescriptor;
-class GPURenderPipelineColorAttachmentDescriptor : public RefCounted<GPURenderPipelineColorAttachmentDescriptor> {
-public:
- unsigned long pixelFormat() const { return 0; }
- void setPixelFormat(unsigned long) { }
-};
-// FIXME: WebGPU - End stub.
</del><ins>+class GPURenderPipelineColorAttachmentDescriptor;
</ins><span class="cx">
</span><span class="cx"> class WebGPURenderPipelineColorAttachmentDescriptor : public WebGPUObject {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPipelineDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -29,10 +29,8 @@
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><span class="cx"> #include "GPUFunction.h"
</span><del>-/* FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPURenderPipelineColorAttachmentDescriptor.h"
</span><span class="cx"> #include "GPURenderPipelineDescriptor.h"
</span><del>-*/
</del><span class="cx"> #include "WebGPUFunction.h"
</span><span class="cx"> #include "WebGPURenderPipelineColorAttachmentDescriptor.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="lines">@@ -54,22 +52,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebGPURenderPipelineDescriptor::label() const
-{
- if (!m_renderPipelineDescriptor)
- return emptyString();
-
- return m_renderPipelineDescriptor->label();
-}
-
-void WebGPURenderPipelineDescriptor::setLabel(const String& label)
-{
- if (!m_renderPipelineDescriptor)
- return;
-
- m_renderPipelineDescriptor->setLabel(label);
-}
-
</del><span class="cx"> RefPtr<WebGPUFunction> WebGPURenderPipelineDescriptor::vertexFunction() const
</span><span class="cx"> {
</span><span class="cx"> return m_vertexFunction;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPipelineDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -35,21 +35,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class GPUFunction;
</span><del>-
-// FIXME: WebGPU - stub implementation.
-class GPURenderPipelineDescriptor : public RefCounted<GPURenderPipelineDescriptor> {
-public:
- static RefPtr<GPURenderPipelineDescriptor> create() { return nullptr; }
- Vector<RefPtr<GPURenderPipelineColorAttachmentDescriptor>> colorAttachments() { return Vector<RefPtr<GPURenderPipelineColorAttachmentDescriptor>>(); }
- String label() const { return emptyString(); }
- void setLabel(const String&) { }
- void setVertexFunction(GPUFunction*) { }
- void setFragmentFunction(GPUFunction*) { }
- unsigned long depthAttachmentPixelFormat() const { return 0; }
- void setDepthAttachmentPixelFormat(unsigned long) { }
-};
-// FIXME: WebGPU - end stub.
-
</del><ins>+class GPURenderPipelineDescriptor;
</ins><span class="cx"> class WebGPUFunction;
</span><span class="cx"> class WebGPURenderPipelineColorAttachmentDescriptor;
</span><span class="cx">
</span><span class="lines">@@ -58,9 +44,6 @@
</span><span class="cx"> virtual ~WebGPURenderPipelineDescriptor();
</span><span class="cx"> static Ref<WebGPURenderPipelineDescriptor> create();
</span><span class="cx">
</span><del>- String label() const;
- void setLabel(const String&);
-
</del><span class="cx"> RefPtr<WebGPUFunction> vertexFunction() const;
</span><span class="cx"> void setVertexFunction(RefPtr<WebGPUFunction>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPipelineDescriptoridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> EnabledAtRuntime=WebGPU
</span><span class="cx"> ] interface WebGPURenderPipelineDescriptor {
</span><span class="cx">
</span><del>- attribute DOMString label;
-
</del><span class="cx"> attribute WebGPUFunction? vertexFunction;
</span><span class="cx"> attribute WebGPUFunction? fragmentFunction;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPipelineStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-/* FIXME: WebGPU - Not implemented yet.FIXME: WebGPU - Not implemented yet.
</del><span class="cx"> #include "GPURenderPipelineState.h"
</span><del>- */
</del><span class="cx"> #include "WebGPURenderPipelineDescriptor.h"
</span><span class="cx"> #include "WebGPURenderingContext.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderPipelineStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.h (213781 => 213782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.h        2017-03-13 05:38:26 UTC (rev 213781)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.h        2017-03-13 06:17:56 UTC (rev 213782)
</span><span class="lines">@@ -33,17 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderPipelineState;
-class GPURenderPipelineDescriptor;
-class GPURenderPipelineState : public RefCounted<GPURenderPipelineState> {
-public:
- static RefPtr<GPURenderPipelineState> create(GPUDevice*, GPURenderPipelineDescriptor*) { return nullptr; }
- String label() const { return emptyString(); }
- void setLabel(const String&) { }
-};
-// FIXME: WebGPU - End stub.
-
</del><ins>+class GPURenderPipelineState;
</ins><span class="cx"> class WebGPURenderPipelineDescriptor;
</span><span class="cx">
</span><span class="cx"> class WebGPURenderPipelineState : public WebGPUObject {
</span></span></pre>
</div>
</div>
</body>
</html>