Changeset 213783 in webkit

Timestamp:

Mar 13, 2017 12:18:33 AM (7 years ago)

Author:

jonlee@apple.com

Message:

WebGPU: Backend - hosting WebGPU layers
​https://bugs.webkit.org/show_bug.cgi?id=169366
<rdar://problem/30928735>

Reviewed by Dean Jackson.

• html/canvas/WebGPURenderingContext.cpp:

(WebCore::WebGPURenderingContext::create): Create the device and the
rendering context.

• platform/graphics/cocoa/GPUCommandBufferMetal.mm:

(WebCore::GPUCommandBuffer::commit):

• platform/graphics/cocoa/GPUDrawableMetal.mm:

(WebCore::GPUDrawable::release): Fix a log message

• platform/graphics/gpu/GPUCommandBuffer.cpp:

(WebCore::GPUCommandBuffer::commit): Deleted. Moved to GPUCommandBufferMetal.

• rendering/RenderLayerBacking.cpp:

(WebCore::canvasCompositingStrategy): WebGPU canvas should return CanvasAsLayerContents.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGPURenderingContext.cpp (modified) (2 diffs)
• platform/graphics/cocoa/GPUCommandBufferMetal.mm (modified) (1 diff)
• platform/graphics/cocoa/GPUDrawableMetal.mm (modified) (1 diff)
• platform/graphics/gpu/GPUCommandBuffer.cpp (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-13  Jon Lee  <jonlee@apple.com>
+
+        WebGPU: Backend - hosting WebGPU layers
+        https://bugs.webkit.org/show_bug.cgi?id=169366
+        <rdar://problem/30928735>
+
+        Reviewed by Dean Jackson.
+
+        * html/canvas/WebGPURenderingContext.cpp:
+        (WebCore::WebGPURenderingContext::create): Create the device and the
+        rendering context.
+        * platform/graphics/cocoa/GPUCommandBufferMetal.mm:
+        (WebCore::GPUCommandBuffer::commit):
+        * platform/graphics/cocoa/GPUDrawableMetal.mm:
+        (WebCore::GPUDrawable::release): Fix a log message
+        * platform/graphics/gpu/GPUCommandBuffer.cpp:
+        (WebCore::GPUCommandBuffer::commit): Deleted. Moved to GPUCommandBufferMetal.
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::canvasCompositingStrategy): WebGPU canvas should return CanvasAsLayerContents.
+
 2017-03-12  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp

@@ -72 +72 @@
 std::unique_ptr<WebGPURenderingContext> WebGPURenderingContext::create(HTMLCanvasElement& canvas)
 {
-    UNUSED_PARAM(canvas);
-/* FIXME: WebGPU - To be implemented.
-    Document& document = canvas.document();
-    Frame* frame = document.frame();
-    if (!frame)
-        return nullptr;
-
-    GPUDevice::Attributes attributes;
-
-    attributes.antialias = false;
-
-    // FIXME: WebGPU - handle retina.
-    // if (page)
-    //     attributes.devicePixelRatio = page->deviceScaleFactor();
-
-    HostWindow* hostWindow = document.view()->root()->hostWindow();
-    RefPtr<GPUDevice> device(GPUDevice::create(attributes, hostWindow));
+    RefPtr<GPUDevice> device(GPUDevice::create());
 
     if (!device) {
@@ -100 +84 @@
 
     return renderingContext;
-*/
-    return nullptr;
 }
 

trunk/Source/WebCore/platform/graphics/cocoa/GPUCommandBufferMetal.mm

@@ -62 +62 @@
 }
 
+void GPUCommandBuffer::commit()
+{
+    if (!m_commandBuffer)
+        return;
+
+    [m_commandBuffer commit];
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/platform/graphics/cocoa/GPUDrawableMetal.mm

@@ -49 +49 @@
 void GPUDrawable::release()
 {
-    LOG(WebGPU, "MetalDrawable::release()");
+    LOG(WebGPU, "GPUDrawable::release()");
     m_drawable = nullptr;
 }

trunk/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.cpp

@@ -48 +48 @@
 }
 
-void GPUCommandBuffer::commit()
-{
-}
-
 RefPtr<GPURenderCommandEncoder> GPUCommandBuffer::createRenderCommandEncoder(GPURenderPassDescriptor* descriptor)
 {

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -85 +85 @@
         return CanvasAsLayerContents;
 
+#if ENABLE(WEBGPU)
+    if (context->isGPU())
+        return CanvasAsLayerContents;
+#endif
+
 #if ENABLE(ACCELERATED_2D_CANVAS)
     return CanvasAsLayerContents;