Title: [239780] trunk
- Revision
- 239780
- Author
- justin_...@apple.com
- Date
- 2019-01-09 12:05:09 -0800 (Wed, 09 Jan 2019)
Log Message
[WebGPU] Fix vertex-buffer-triangle-strip test and small update to GPURenderPipeline
https://bugs.webkit.org/show_bug.cgi?id=193289
Reviewed by Dean Jackson.
Source/WebCore:
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):
LayoutTests:
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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (239779 => 239780)
--- trunk/LayoutTests/ChangeLog 2019-01-09 19:38:45 UTC (rev 239779)
+++ trunk/LayoutTests/ChangeLog 2019-01-09 20:05:09 UTC (rev 239780)
@@ -1,3 +1,16 @@
+2019-01-09 Justin Fan <justin_...@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 Dean Jackson.
+
+ 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_hs...@apple.com>
[iOS] editing/selection/ios/show-selection-in-empty-overflow-hidden-document.html often times out in internal automation
Modified: trunk/LayoutTests/webgpu/js/webgpu-functions.js (239779 => 239780)
--- trunk/LayoutTests/webgpu/js/webgpu-functions.js 2019-01-09 19:38:45 UTC (rev 239779)
+++ trunk/LayoutTests/webgpu/js/webgpu-functions.js 2019-01-09 20:05:09 UTC (rev 239780)
@@ -24,7 +24,6 @@
};
const pipelineDescriptor = {
- layout: pipelineLayout,
vertexStage: vertexStageDescriptor,
fragmentStage: fragmentStageDescriptor,
primitiveTopology: "triangleStrip",
@@ -31,6 +30,9 @@
inputState: inputStateDescriptor
};
+ if (pipelineLayout)
+ pipelineDescriptor.layout = pipelineLayout;
+
return device.createRenderPipeline(pipelineDescriptor);
}
Modified: trunk/LayoutTests/webgpu/vertex-buffer-triangle-strip.html (239779 => 239780)
--- trunk/LayoutTests/webgpu/vertex-buffer-triangle-strip.html 2019-01-09 19:38:45 UTC (rev 239779)
+++ trunk/LayoutTests/webgpu/vertex-buffer-triangle-strip.html 2019-01-09 20:05:09 UTC (rev 239780)
@@ -82,7 +82,7 @@
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);
Modified: trunk/Source/WebCore/ChangeLog (239779 => 239780)
--- trunk/Source/WebCore/ChangeLog 2019-01-09 19:38:45 UTC (rev 239779)
+++ trunk/Source/WebCore/ChangeLog 2019-01-09 20:05:09 UTC (rev 239780)
@@ -1,3 +1,18 @@
+2019-01-09 Justin Fan <justin_...@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 Dean Jackson.
+
+ 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 Devin Rousso <drou...@apple.com>
Web Inspector: Protocol Logging: log messages as objects if inspector^2 is open
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipeline.h (239779 => 239780)
--- trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipeline.h 2019-01-09 19:38:45 UTC (rev 239779)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipeline.h 2019-01-09 20:05:09 UTC (rev 239780)
@@ -49,13 +49,14 @@
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
Modified: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm (239779 => 239780)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm 2019-01-09 19:38:45 UTC (rev 239779)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm 2019-01-09 20:05:09 UTC (rev 239780)
@@ -208,7 +208,8 @@
GPURenderPipeline::GPURenderPipeline(PlatformRenderPipelineSmartPtr&& pipeline, GPURenderPipelineDescriptor&& descriptor)
: m_platformRenderPipeline(WTFMove(pipeline))
- , m_descriptor(WTFMove(descriptor))
+ , m_layout(WTFMove(descriptor.layout))
+ , m_primitiveTopology(descriptor.primitiveTopology)
{
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
