Attachment 358717 Details for Bug 193289 – Patch

[patch] Patch

bug-193289-20190109112401.patch (text/plain), 5.38 KB, created by Justin Fan on 2019-01-09 11:24:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Fan

Created: 2019-01-09 11:24:02 PST

Size: 5.38 KB

patch

obsolete

>Subversion Revision: 239773
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 63394d701f2531582bcb2ddc2a6d087d7b10b596..5c7bc4fda6d4c8484a517e0660bc2e583b4c8c0f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-09  Justin Fan  <justin_fan@apple.com>
>+
>+        [WebGPU] Fix vertex-buffer-triangle-strip test and small update to GPURenderPipeline
>+        https://bugs.webkit.org/show_bug.cgi?id=193289
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix broken test after pipeline layouts were added, and a small refactoring to GPURenderPipeline to avoid
>+        retaining its descriptor after creation.
>+
>+        * platform/graphics/gpu/GPURenderPipeline.h:
>+        (WebCore::GPURenderPipeline::primitiveTopology const):
>+        * platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm:
>+        (WebCore::GPURenderPipeline::GPURenderPipeline):
>+
> 2019-01-09  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC][MarginCollapsing] Add support for peculiar cases.
>diff --git a/Source/WebCore/platform/graphics/gpu/GPURenderPipeline.h b/Source/WebCore/platform/graphics/gpu/GPURenderPipeline.h
>index b3b5484be86a2a3aed53196ff949a38cacaf2a08..b302e342e77309a4aa2d9277b80f1735dba6d871 100644
>--- a/Source/WebCore/platform/graphics/gpu/GPURenderPipeline.h
>+++ b/Source/WebCore/platform/graphics/gpu/GPURenderPipeline.h
>@@ -49,13 +49,14 @@ public:
> 
>     PlatformRenderPipeline* platformRenderPipeline() const { return m_platformRenderPipeline.get(); }
> 
>-    PrimitiveTopology primitiveTopology() const { return m_descriptor.primitiveTopology; }
>+    PrimitiveTopology primitiveTopology() const { return m_primitiveTopology; }
> 
> private:
>     GPURenderPipeline(PlatformRenderPipelineSmartPtr&&, GPURenderPipelineDescriptor&&);
> 
>     PlatformRenderPipelineSmartPtr m_platformRenderPipeline;
>-    GPURenderPipelineDescriptor m_descriptor;
>+    RefPtr<GPUPipelineLayout> m_layout;
>+    PrimitiveTopology m_primitiveTopology;
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm b/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm
>index bf2224cb8e9aa2f9070b5a09b8f2d32371ff09d6..79ae926914a7d5e747209a068b05cad91a4e7599 100644
>--- a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm
>+++ b/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm
>@@ -208,7 +208,8 @@ RefPtr<GPURenderPipeline> GPURenderPipeline::create(const GPUDevice& device, GPU
> 
> GPURenderPipeline::GPURenderPipeline(PlatformRenderPipelineSmartPtr&& pipeline, GPURenderPipelineDescriptor&& descriptor)
>     : m_platformRenderPipeline(WTFMove(pipeline))
>-    , m_descriptor(WTFMove(descriptor))
>+    , m_layout(WTFMove(descriptor.layout))
>+    , m_primitiveTopology(descriptor.primitiveTopology)
> {
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3febcb522141408d68bec2e0ae8b48f5f0b7ba56..e78b6992b9c7204fba68150c57ab9a1d9d52392a 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-09  Justin Fan  <justin_fan@apple.com>
>+
>+        [WebGPU] Fix vertex-buffer-triangle-strip test and small update to GPURenderPipeline
>+        https://bugs.webkit.org/show_bug.cgi?id=193289
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix broken test after pipeline layouts were added.
>+
>+        * webgpu/js/webgpu-functions.js: 
>+        (createBasicPipeline): Ensure pipeline layout is actually optional.
>+        * webgpu/vertex-buffer-triangle-strip.html: 
>+
> 2019-01-09  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] editing/selection/ios/show-selection-in-empty-overflow-hidden-document.html often times out in internal automation
>diff --git a/LayoutTests/webgpu/js/webgpu-functions.js b/LayoutTests/webgpu/js/webgpu-functions.js
>index e0f97794e5c9c4a7c2549b60abe5b35553164b00..c75302be8929dfdef0c2029e536a0cd8da6de0b9 100644
>--- a/LayoutTests/webgpu/js/webgpu-functions.js
>+++ b/LayoutTests/webgpu/js/webgpu-functions.js
>@@ -24,13 +24,15 @@ function createBasicPipeline(shaderModule, device, pipelineLayout, inputStateDes
>     };
> 
>     const pipelineDescriptor = {
>-        layout: pipelineLayout,
>         vertexStage: vertexStageDescriptor,
>         fragmentStage: fragmentStageDescriptor,
>         primitiveTopology: "triangleStrip",
>         inputState: inputStateDescriptor
>     };
> 
>+    if (pipelineLayout)
>+        pipelineDescriptor.layout = pipelineLayout;
>+
>     return device.createRenderPipeline(pipelineDescriptor);
> }
> 
>diff --git a/LayoutTests/webgpu/vertex-buffer-triangle-strip.html b/LayoutTests/webgpu/vertex-buffer-triangle-strip.html
>index 742b484f56212283b7e40d958b62814980bad531..ae97379f8f7e9325bdb2a4a1800b2f4ab397765c 100644
>--- a/LayoutTests/webgpu/vertex-buffer-triangle-strip.html
>+++ b/LayoutTests/webgpu/vertex-buffer-triangle-strip.html
>@@ -82,7 +82,7 @@ async function test() {
>     const shaderModule = device.createShaderModule({ code: shaderCode });
>     const vertexBuffer = createVertexBuffer(device);
>     const inputStateDescriptor = createInputStateDescriptor();
>-    const pipeline = createBasicPipeline(shaderModule, device, inputStateDescriptor);
>+    const pipeline = createBasicPipeline(shaderModule, device, null, inputStateDescriptor);
>     const commandBuffer = device.createCommandBuffer();
>     const passEncoder = beginBasicRenderPass(context, commandBuffer);
>     const endCommandBuffer = encodeBasicCommands(passEncoder, pipeline, vertexBuffer);

Actions: View | Formatted Diff | Diff

Attachments on bug 193289: 358717