Commit c11e69d6 authored by Corentin Wallez's avatar Corentin Wallez Committed by Commit Bot

Roll src/third_party/dawn/ 0c4d75931..d46cabd73 (5 commits)

https://dawn.googlesource.com/dawn.git/+log/0c4d75931a0f..d46cabd73fb4

$ git log 0c4d75931..d46cabd73 --date=short --no-merges --format='%ad %ae %s'
2019-09-20 cwallez Fix the orientation of CubeReflection
2019-09-20 cwallez Remove indirection for colorStates
2019-09-20 cwallez Make ComboRenderPipelineDescriptor non copyable.
2019-09-20 yunchao.he Set y-axis up in normalized coordinate system.
2019-09-20 cwallez Remove indirection for colorAttachments

Created with:
  roll-dep src/third_party/dawn

TBR=kbr@chromium.org

Bug: dawn:22
Change-Id: I06d6a7904e136381489968898a4279dbb58515d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1817285Reviewed-by: default avatarCorentin Wallez <cwallez@chromium.org>
Reviewed-by: default avatarAustin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698712}
parent e74d6b59
...@@ -297,7 +297,7 @@ vars = { ...@@ -297,7 +297,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'dawn_revision': '0c4d75931a0fde954689e46806bfc84889463114', 'dawn_revision': 'd46cabd73fb4b06bc5a18ce56b2803bb4bb64d21',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -300,12 +300,9 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) { ...@@ -300,12 +300,9 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) {
color_desc.storeOp = dawn::StoreOp::Store; color_desc.storeOp = dawn::StoreOp::Store;
color_desc.clearColor = {0, 255, 0, 255}; color_desc.clearColor = {0, 255, 0, 255};
dawn::RenderPassColorAttachmentDescriptor* color_attachments_ptr =
&color_desc;
dawn::RenderPassDescriptor renderPassDesc; dawn::RenderPassDescriptor renderPassDesc;
renderPassDesc.colorAttachmentCount = 1; renderPassDesc.colorAttachmentCount = 1;
renderPassDesc.colorAttachments = &color_attachments_ptr; renderPassDesc.colorAttachments = &color_desc;
renderPassDesc.depthStencilAttachment = nullptr; renderPassDesc.depthStencilAttachment = nullptr;
dawn::CommandEncoder encoder = device.CreateCommandEncoder(); dawn::CommandEncoder encoder = device.CreateCommandEncoder();
......
...@@ -113,12 +113,9 @@ TEST_F(WebGPUMailboxTest, WriteToMailboxThenReadFromIt) { ...@@ -113,12 +113,9 @@ TEST_F(WebGPUMailboxTest, WriteToMailboxThenReadFromIt) {
color_desc.storeOp = dawn::StoreOp::Store; color_desc.storeOp = dawn::StoreOp::Store;
color_desc.clearColor = {0, 255, 0, 255}; color_desc.clearColor = {0, 255, 0, 255};
dawn::RenderPassColorAttachmentDescriptor* color_attachments_ptr =
&color_desc;
dawn::RenderPassDescriptor render_pass_desc; dawn::RenderPassDescriptor render_pass_desc;
render_pass_desc.colorAttachmentCount = 1; render_pass_desc.colorAttachmentCount = 1;
render_pass_desc.colorAttachments = &color_attachments_ptr; render_pass_desc.colorAttachments = &color_desc;
render_pass_desc.depthStencilAttachment = nullptr; render_pass_desc.depthStencilAttachment = nullptr;
dawn::CommandEncoder encoder = device.CreateCommandEncoder(); dawn::CommandEncoder encoder = device.CreateCommandEncoder();
......
...@@ -178,23 +178,11 @@ GPURenderPassEncoder* GPUCommandEncoder::beginRenderPass( ...@@ -178,23 +178,11 @@ GPURenderPassEncoder* GPUCommandEncoder::beginRenderPass(
dawn_desc.colorAttachmentCount = color_attachment_count; dawn_desc.colorAttachmentCount = color_attachment_count;
dawn_desc.colorAttachments = nullptr; dawn_desc.colorAttachments = nullptr;
using DescriptorPtr = DawnRenderPassColorAttachmentDescriptor*; std::unique_ptr<DawnRenderPassColorAttachmentDescriptor[]> color_attachments;
using DescriptorArray = DawnRenderPassColorAttachmentDescriptor[];
using DescriptorPtrArray = DescriptorPtr[];
std::unique_ptr<DescriptorArray> color_attachments;
std::unique_ptr<DescriptorPtrArray> color_attachment_ptrs;
if (color_attachment_count > 0) { if (color_attachment_count > 0) {
color_attachments = AsDawnType(descriptor->colorAttachments()); color_attachments = AsDawnType(descriptor->colorAttachments());
dawn_desc.colorAttachments = color_attachments.get();
color_attachment_ptrs = std::unique_ptr<DescriptorPtrArray>(
new DescriptorPtr[color_attachment_count]);
for (uint32_t i = 0; i < color_attachment_count; ++i) {
color_attachment_ptrs[i] = color_attachments.get() + i;
}
dawn_desc.colorAttachments = color_attachment_ptrs.get();
} }
DawnRenderPassDepthStencilAttachmentDescriptor depthStencilAttachment = {}; DawnRenderPassDepthStencilAttachmentDescriptor depthStencilAttachment = {};
......
...@@ -276,8 +276,7 @@ GPURenderPipeline* GPURenderPipeline::Create( ...@@ -276,8 +276,7 @@ GPURenderPipeline* GPURenderPipeline::Create(
dawn_desc.colorStateCount = dawn_desc.colorStateCount =
static_cast<uint32_t>(webgpu_desc->colorStates().size()); static_cast<uint32_t>(webgpu_desc->colorStates().size());
DawnColorStateDescriptor* color_state_descriptors = color_states.get(); dawn_desc.colorStates = color_states.get();
dawn_desc.colorStates = &color_state_descriptors;
dawn_desc.sampleMask = webgpu_desc->sampleMask(); dawn_desc.sampleMask = webgpu_desc->sampleMask();
dawn_desc.alphaToCoverageEnabled = webgpu_desc->alphaToCoverageEnabled(); dawn_desc.alphaToCoverageEnabled = webgpu_desc->alphaToCoverageEnabled();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment