Diff
Modified: trunk/Source/WebCore/ChangeLog (213781 => 213782)
--- 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)
@@ -1,3 +1,42 @@
+2017-03-12 Jon Lee <[email protected]>
+
+ 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:
+
2017-03-12 Dean Jackson <[email protected]>
WebGPU Backend
Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp (213781 => 213782)
--- 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)
@@ -28,10 +28,8 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPUCommandBuffer.h"
#include "GPUCommandQueue.h"
-*/
#include "Logging.h"
#include "WebGPUCommandQueue.h"
#include "WebGPUDrawable.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandBuffer.h (213781 => 213782)
--- 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)
@@ -33,18 +33,7 @@
namespace WebCore {
-// 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.
+class GPUCommandBuffer;
class WebGPUCommandQueue;
class WebGPUDrawable;
class WebGPUFunction;
Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPUCommandQueue.h"
-*/
#include "WebGPUCommandBuffer.h"
#include "WebGPURenderingContext.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPUCommandQueue.h (213781 => 213782)
--- 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)
@@ -34,17 +34,7 @@
namespace WebCore {
class GPUCommandBuffer;
-
-// 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.
-
+class GPUCommandQueue;
class WebGPUCommandBuffer;
class WebGPUCommandQueue : public WebGPUObject {
Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPUDepthStencilDescriptor.h"
-*/
#include "WebGPURenderingContext.h"
namespace WebCore {
@@ -50,22 +48,6 @@
{
}
-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);
-}
-
bool WebGPUDepthStencilDescriptor::depthWriteEnabled() const
{
if (!m_depthStencilDescriptor)
@@ -91,12 +73,6 @@
{
m_depthCompareFunction = newDepthCompareFunction;
m_depthStencilDescriptor->setDepthCompareFunction(toGPUCompareFunction(m_depthCompareFunction));
-
-// FIXME: WebGPU - not implemented yet.
-// if (Optional<WebGPUCompareFunction> compareFunction = toWebGPUCompareFunction(newDepthCompareFunction)) {
-// m_depthCompareFunction = compareFunction.value();
-// m_depthStencilDescriptor->setDepthCompareFunction(toGPUCompareFunction(m_depthCompareFunction));
-// }
}
} // namespace WebCore
Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h (213781 => 213782)
--- 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)
@@ -34,18 +34,7 @@
namespace WebCore {
-// 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.
+class GPUDepthStencilDescriptor;
class WebGPUDepthStencilDescriptor : public WebGPUObject {
public:
@@ -52,9 +41,6 @@
virtual ~WebGPUDepthStencilDescriptor();
static Ref<WebGPUDepthStencilDescriptor> create();
- String label() const;
- void setLabel(const String&);
-
bool depthWriteEnabled() const;
void setDepthWriteEnabled(bool);
Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl (213781 => 213782)
--- 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)
@@ -43,8 +43,6 @@
EnabledAtRuntime=WebGPU
] interface WebGPUDepthStencilDescriptor {
- attribute DOMString label;
-
attribute WebGPUCompareFunction depthCompareFunction;
attribute boolean depthWriteEnabled;
Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPUDepthStencilState.h"
- */
#include "WebGPUDepthStencilDescriptor.h"
#include "WebGPURenderingContext.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPUDepthStencilState.h (213781 => 213782)
--- 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)
@@ -33,17 +33,7 @@
namespace WebCore {
-// 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.
+class GPUDepthStencilState;
class WebGPUDepthStencilDescriptor;
class WebGPUDepthStencilState : public WebGPUObject {
Modified: trunk/Source/WebCore/html/canvas/WebGPUEnums.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPUEnums.h"
- */
namespace WebCore {
Modified: trunk/Source/WebCore/html/canvas/WebGPUEnums.h (213781 => 213782)
--- 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)
@@ -32,6 +32,8 @@
namespace WebCore {
+enum class GPUCompareFunction;
+
enum class WebGPUCompareFunction {
Never,
Less,
@@ -45,20 +47,6 @@
std::optional<WebGPUCompareFunction> toWebGPUCompareFunction(const String&);
String web3DCompareFunctionName(const WebGPUCompareFunction);
-
-// 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.
GPUCompareFunction toGPUCompareFunction(const WebGPUCompareFunction);
} // namespace WebCore
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp (213781 => 213782)
--- 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)
@@ -28,11 +28,9 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPUCommandBuffer.h"
#include "GPURenderCommandEncoder.h"
#include "GPURenderPassDescriptor.h"
-*/
#include "WebGPUBuffer.h"
#include "WebGPUCommandBuffer.h"
#include "WebGPUDepthStencilState.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h (213781 => 213782)
--- 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)
@@ -33,21 +33,10 @@
namespace WebCore {
-// FIXME: WebGPU - Stub implementation - not implemented yet.
-// class GPURenderCommandEncoder;
+class GPURenderCommandEncoder;
class GPUBuffer;
class GPURenderPipelineState;
class GPUDepthStencilState;
-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.
class WebGPUCommandBuffer;
class WebGPUDepthStencilState;
class WebGPURenderPassDescriptor;
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPURenderPassAttachmentDescriptor.h"
- */
#include "GPUTexture.h"
#include "WebGPURenderingContext.h"
#include "WebGPUTexture.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h (213781 => 213782)
--- 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)
@@ -33,17 +33,7 @@
namespace WebCore {
-// 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.
+class GPURenderPassAttachmentDescriptor;
class WebGPUTexture;
class WebGPURenderPassAttachmentDescriptor : public WebGPUObject {
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPURenderPassColorAttachmentDescriptor.h"
- */
#include "GPUTexture.h"
#include "WebGPURenderingContext.h"
#include "WebGPUTexture.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h (213781 => 213782)
--- 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)
@@ -34,14 +34,7 @@
namespace WebCore {
-// 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.
+class GPURenderPassColorAttachmentDescriptor;
class WebGPURenderPassColorAttachmentDescriptor : public WebGPURenderPassAttachmentDescriptor {
public:
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPURenderPassDepthAttachmentDescriptor.h"
- */
#include "GPUTexture.h"
#include "WebGPURenderingContext.h"
#include "WebGPUTexture.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h (213781 => 213782)
--- 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)
@@ -32,14 +32,7 @@
namespace WebCore {
-// 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.
+class GPURenderPassDepthAttachmentDescriptor;
class WebGPURenderPassDepthAttachmentDescriptor : public WebGPURenderPassAttachmentDescriptor {
public:
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp (213781 => 213782)
--- 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)
@@ -28,11 +28,9 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPURenderPassColorAttachmentDescriptor.h"
#include "GPURenderPassDepthAttachmentDescriptor.h"
#include "GPURenderPassDescriptor.h"
-*/
#include "WebGPURenderPassColorAttachmentDescriptor.h"
#include "WebGPURenderPassDepthAttachmentDescriptor.h"
#include "WebGPURenderingContext.h"
@@ -72,10 +70,9 @@
return Vector<RefPtr<WebGPURenderPassColorAttachmentDescriptor>>();
if (!m_colorAttachmentDescriptors.size()) {
- // 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()));
+ Vector<RefPtr<GPURenderPassColorAttachmentDescriptor>> platformColorAttachments = m_renderPassDescriptor->colorAttachments();
+ for (auto& attachment : platformColorAttachments)
+ m_colorAttachmentDescriptors.append(WebGPURenderPassColorAttachmentDescriptor::create(this->context(), attachment.get()));
}
return m_colorAttachmentDescriptors;
}
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h (213781 => 213782)
--- 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)
@@ -28,26 +28,14 @@
#if ENABLE(WEBGPU)
#include "WebGPUObject.h"
-/* FIXME: WebGPU - Not implemented yet.
#include "WebGPURenderPassColorAttachmentDescriptor.h"
#include "WebGPURenderPassDepthAttachmentDescriptor.h"
-*/
#include <wtf/Vector.h>
namespace WebCore {
-// 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.
-
+class GPURenderPassDescriptor;
class WebGPURenderPassColorAttachmentDescriptor;
class WebGPURenderPassDepthAttachmentDescriptor;
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.
#include "GPURenderPipelineColorAttachmentDescriptor.h"
-*/
#include "WebGPURenderingContext.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h (213781 => 213782)
--- 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)
@@ -32,14 +32,7 @@
namespace WebCore {
-// 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.
+class GPURenderPipelineColorAttachmentDescriptor;
class WebGPURenderPipelineColorAttachmentDescriptor : public WebGPUObject {
public:
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp (213781 => 213782)
--- 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)
@@ -29,10 +29,8 @@
#if ENABLE(WEBGPU)
#include "GPUFunction.h"
-/* FIXME: WebGPU - Not implemented yet.
#include "GPURenderPipelineColorAttachmentDescriptor.h"
#include "GPURenderPipelineDescriptor.h"
-*/
#include "WebGPUFunction.h"
#include "WebGPURenderPipelineColorAttachmentDescriptor.h"
#include "WebGPURenderingContext.h"
@@ -54,22 +52,6 @@
{
}
-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);
-}
-
RefPtr<WebGPUFunction> WebGPURenderPipelineDescriptor::vertexFunction() const
{
return m_vertexFunction;
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h (213781 => 213782)
--- 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)
@@ -35,21 +35,7 @@
namespace WebCore {
class GPUFunction;
-
-// 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.
-
+class GPURenderPipelineDescriptor;
class WebGPUFunction;
class WebGPURenderPipelineColorAttachmentDescriptor;
@@ -58,9 +44,6 @@
virtual ~WebGPURenderPipelineDescriptor();
static Ref<WebGPURenderPipelineDescriptor> create();
- String label() const;
- void setLabel(const String&);
-
RefPtr<WebGPUFunction> vertexFunction() const;
void setVertexFunction(RefPtr<WebGPUFunction>);
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl (213781 => 213782)
--- 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)
@@ -29,8 +29,6 @@
EnabledAtRuntime=WebGPU
] interface WebGPURenderPipelineDescriptor {
- attribute DOMString label;
-
attribute WebGPUFunction? vertexFunction;
attribute WebGPUFunction? fragmentFunction;
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp (213781 => 213782)
--- 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)
@@ -28,9 +28,7 @@
#if ENABLE(WEBGPU)
-/* FIXME: WebGPU - Not implemented yet.FIXME: WebGPU - Not implemented yet.
#include "GPURenderPipelineState.h"
- */
#include "WebGPURenderPipelineDescriptor.h"
#include "WebGPURenderingContext.h"
Modified: trunk/Source/WebCore/html/canvas/WebGPURenderPipelineState.h (213781 => 213782)
--- 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)
@@ -33,17 +33,7 @@
namespace WebCore {
-// 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.
-
+class GPURenderPipelineState;
class WebGPURenderPipelineDescriptor;
class WebGPURenderPipelineState : public WebGPUObject {
