Remove stubs from WebGPU front end
authorjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Mar 2017 06:17:56 +0000 (06:17 +0000)
committerjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Mar 2017 06:17:56 +0000 (06:17 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@213782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

29 files changed:
Source/WebCore/ChangeLog
Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp
Source/WebCore/html/canvas/WebGPUCommandBuffer.h
Source/WebCore/html/canvas/WebGPUCommandQueue.cpp
Source/WebCore/html/canvas/WebGPUCommandQueue.h
Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp
Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h
Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl
Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp
Source/WebCore/html/canvas/WebGPUDepthStencilState.h
Source/WebCore/html/canvas/WebGPUEnums.cpp
Source/WebCore/html/canvas/WebGPUEnums.h
Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp
Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h
Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h
Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h
Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h
Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp
Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h
Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h
Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp
Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h
Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl
Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp
Source/WebCore/html/canvas/WebGPURenderPipelineState.h

index b990797..c46fc48 100644 (file)
@@ -1,3 +1,42 @@
+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:
+
 2017-03-12  Dean Jackson  <dino@apple.com>
 
         WebGPU Backend
index 20eaf81..6830ed3 100644 (file)
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPUCommandBuffer.h"
 #include "GPUCommandQueue.h"
-*/
 #include "Logging.h"
 #include "WebGPUCommandQueue.h"
 #include "WebGPUDrawable.h"
index af26a4e..54646a0 100644 (file)
 
 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;
index 6f57cf3..cd4421a 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPUCommandQueue.h"
-*/
 #include "WebGPUCommandBuffer.h"
 #include "WebGPURenderingContext.h"
 
index 8f3959f..b93b93c 100644 (file)
 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 {
index c534b73..8ac0d99 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPUDepthStencilDescriptor.h"
-*/
 #include "WebGPURenderingContext.h"
 
 namespace WebCore {
@@ -50,22 +48,6 @@ WebGPUDepthStencilDescriptor::~WebGPUDepthStencilDescriptor()
 {
 }
 
-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 @@ void WebGPUDepthStencilDescriptor::setDepthCompareFunction(CompareFunction newDe
 {
     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
index 7f56b9c..4cdb401 100644 (file)
 
 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:
     virtual ~WebGPUDepthStencilDescriptor();
     static Ref<WebGPUDepthStencilDescriptor> create();
 
-    String label() const;
-    void setLabel(const String&);
-
     bool depthWriteEnabled() const;
     void setDepthWriteEnabled(bool);
 
index 93b5fc9..45120fe 100644 (file)
@@ -43,8 +43,6 @@
     EnabledAtRuntime=WebGPU
 ] interface WebGPUDepthStencilDescriptor {
 
-    attribute DOMString label;
-
     attribute WebGPUCompareFunction depthCompareFunction;
     attribute boolean depthWriteEnabled;
 
index 8f3f2ad..702aab8 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPUDepthStencilState.h"
- */
 #include "WebGPUDepthStencilDescriptor.h"
 #include "WebGPURenderingContext.h"
 
index 3d4591e..ba97b86 100644 (file)
 
 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 {
index 16db13e..e1b4966 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPUEnums.h"
- */
 
 namespace WebCore {
 
index c94ca2c..5f9faa5 100644 (file)
@@ -32,6 +32,8 @@
 
 namespace WebCore {
 
+enum class GPUCompareFunction;
+
 enum class WebGPUCompareFunction {
     Never,
     Less,
@@ -45,20 +47,6 @@ enum class WebGPUCompareFunction {
 
 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
index 702633d..9b694d9 100644 (file)
 
 #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"
index d681b4f..66cec59 100644 (file)
 
 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;
index 6519a65..0f52679 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPURenderPassAttachmentDescriptor.h"
- */
 #include "GPUTexture.h"
 #include "WebGPURenderingContext.h"
 #include "WebGPUTexture.h"
index 8ade0d4..a6253f4 100644 (file)
 
 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 {
index b669643..af499b3 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPURenderPassColorAttachmentDescriptor.h"
- */
 #include "GPUTexture.h"
 #include "WebGPURenderingContext.h"
 #include "WebGPUTexture.h"
index 7399a9d..ee89716 100644 (file)
 
 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:
index 68335ea..025d17d 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPURenderPassDepthAttachmentDescriptor.h"
- */
 #include "GPUTexture.h"
 #include "WebGPURenderingContext.h"
 #include "WebGPUTexture.h"
index 7864794..603154c 100644 (file)
 
 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:
index ee9c16f..f4e5f4b 100644 (file)
 
 #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 @@ Vector<RefPtr<WebGPURenderPassColorAttachmentDescriptor>> WebGPURenderPassDescri
         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;
 }
index 7d54890..b9d1872 100644 (file)
 #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;
 
index 673d34a..1f89dec 100644 (file)
@@ -28,9 +28,7 @@
 
 #if ENABLE(WEBGPU)
 
-/* FIXME: WebGPU - Not implemented yet.
 #include "GPURenderPipelineColorAttachmentDescriptor.h"
-*/
 #include "WebGPURenderingContext.h"
 
 namespace WebCore {
index 5dba2b9..7a4aaff 100644 (file)
 
 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:
index eb4eb18..58feacf 100644 (file)
 #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 @@ WebGPURenderPipelineDescriptor::~WebGPURenderPipelineDescriptor()
 {
 }
 
-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;
index 17c953a..874e3df 100644 (file)
 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 @@ public:
     virtual ~WebGPURenderPipelineDescriptor();
     static Ref<WebGPURenderPipelineDescriptor> create();
 
-    String label() const;
-    void setLabel(const String&);
-
     RefPtr<WebGPUFunction> vertexFunction() const;
     void setVertexFunction(RefPtr<WebGPUFunction>);
 
index a98683d..ddbdd86 100644 (file)
@@ -29,8 +29,6 @@
     EnabledAtRuntime=WebGPU
 ] interface WebGPURenderPipelineDescriptor {
 
-    attribute DOMString label;
-
     attribute WebGPUFunction? vertexFunction;
     attribute WebGPUFunction? fragmentFunction;
 
index 3d2123f..410c102 100644 (file)
@@ -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"
 
index c4cc64b..464c064 100644 (file)
 
 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 {