commit e40c87c98610b13628b2d1bd9c440c1e1d7f52d4
author Austin Eng <enga@chromium.org> Tue Dec 03 21:08:45 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Dec 03 21:08:45 2019 +0000
tree 866237c6fe7af0732c48f57b0ca4f008a279ef9f
parent f9033b89e57c8554bd74b7ffa0b5d61d86b25ec1

Use GetBindGroupLayout in ComputeSharedMemoryTests

Bug: dawn:276
Change-Id: I024ec718b3f8423f6c271404d4beb125987290dc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/14024
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/tests/end2end/ComputeSharedMemoryTests.cpp

diff --git a/src/tests/end2end/ComputeSharedMemoryTests.cpp b/src/tests/end2end/ComputeSharedMemoryTests.cpp
index 8ba9769..8c5f756 100644
--- a/src/tests/end2end/ComputeSharedMemoryTests.cpp
+++ b/src/tests/end2end/ComputeSharedMemoryTests.cpp
@@ -26,17 +26,10 @@
 };
 
 void ComputeSharedMemoryTests::BasicTest(const char* shader) {
-    auto bgl = utils::MakeBindGroupLayout(
-        device, {
-                    {0, wgpu::ShaderStage::Compute, wgpu::BindingType::StorageBuffer},
-                });
-
     // Set up shader and pipeline
     auto module = utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, shader);
-    auto pl = utils::MakeBasicPipelineLayout(device, &bgl);
 
     wgpu::ComputePipelineDescriptor csDesc;
-    csDesc.layout = pl;
     csDesc.computeStage.module = module;
     csDesc.computeStage.entryPoint = "main";
     wgpu::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc);
@@ -52,7 +45,7 @@
     dst.SetSubData(0, sizeof(zero), &zero);
 
     // Set up bind group and issue dispatch
-    wgpu::BindGroup bindGroup = utils::MakeBindGroup(device, bgl,
+    wgpu::BindGroup bindGroup = utils::MakeBindGroup(device, pipeline.GetBindGroupLayout(0),
                                                      {
                                                          {0, dst, 0, sizeof(uint32_t)},
                                                      });