commit 1ac4565115fdf8747b2444808b81b3221646235c
author Corentin Wallez <cwallez@chromium.org> Tue Sep 14 10:42:22 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 14 10:42:22 2021 +0000
tree dc885a50085c2f7e0a6cbc2868fc04ef86673e2c
parent 96ac969a33de78c673e767e0504e93b1d89a2db3

Remove deprecated RenderPass*Attachment.attachment

Bug: dawn:762
Change-Id: I86144f77ffd647d2e5c01742fb67367c7a5c914e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/63382
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Brandon Jones <bajones@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>

src/tests/end2end/DeprecatedAPITests.cpp

diff --git a/src/tests/end2end/DeprecatedAPITests.cpp b/src/tests/end2end/DeprecatedAPITests.cpp
index 9f28ddd..10597ae 100644
--- a/src/tests/end2end/DeprecatedAPITests.cpp
+++ b/src/tests/end2end/DeprecatedAPITests.cpp
@@ -34,44 +34,6 @@
     }
 };
 
-// Test that setting attachment rather than view for render pass color and depth/stencil attachments
-// is deprecated.
-TEST_P(DeprecationTests, SetAttachmentDescriptorAttachment) {
-    utils::BasicRenderPass renderPass = utils::CreateBasicRenderPass(device, 1, 1);
-    wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
-    wgpu::RenderPassEncoder pass;
-
-    // Check that using .attachment with color attachments gives the warning.
-    wgpu::RenderPassColorAttachment* colorAttachment =
-        &renderPass.renderPassInfo.cColorAttachments[0];
-    colorAttachment->attachment = colorAttachment->view;
-    colorAttachment->view = nullptr;
-
-    EXPECT_DEPRECATION_WARNING(pass = encoder.BeginRenderPass(&renderPass.renderPassInfo));
-    pass.EndPass();
-
-    colorAttachment->view = colorAttachment->attachment;
-    colorAttachment->attachment = nullptr;
-
-    // Check that using .attachment with depth/stencil attachments gives the warning.
-    wgpu::TextureDescriptor descriptor;
-    descriptor.dimension = wgpu::TextureDimension::e2D;
-    descriptor.size = {1, 1, 1};
-    descriptor.sampleCount = 1;
-    descriptor.format = wgpu::TextureFormat::Depth24PlusStencil8;
-    descriptor.mipLevelCount = 1;
-    descriptor.usage = wgpu::TextureUsage::RenderAttachment;
-    wgpu::Texture depthStencil = device.CreateTexture(&descriptor);
-
-    wgpu::RenderPassDepthStencilAttachment* depthAttachment =
-        &renderPass.renderPassInfo.cDepthStencilAttachmentInfo;
-    renderPass.renderPassInfo.depthStencilAttachment = depthAttachment;
-    depthAttachment->attachment = depthStencil.CreateView();
-
-    EXPECT_DEPRECATION_WARNING(pass = encoder.BeginRenderPass(&renderPass.renderPassInfo));
-    pass.EndPass();
-}
-
 // Test that setting computeStage in a ComputePipelineDescriptor is deprecated.
 TEST_P(DeprecationTests, ComputeStage) {
     wgpu::ComputePipelineDescriptor csDesc;

src/tests/white_box/D3D12DescriptorHeapTests.cpp

diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
index 77e6b80..b38eb5f 100644
--- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp
+++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
@@ -763,7 +763,7 @@
         utils::ComboRenderPassDescriptor renderPassDesc({textureView});
         renderPassDesc.cColorAttachments[0].loadOp = wgpu::LoadOp::Clear;
         renderPassDesc.cColorAttachments[0].clearColor = {0.0f, 1.0f, 0.0f, 1.0f};
-        renderPass.renderPassInfo.cColorAttachments[0].attachment = textureView;
+        renderPass.renderPassInfo.cColorAttachments[0].view = textureView;
 
         wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
         auto pass = encoder.BeginRenderPass(&renderPassDesc);