commit 016f3060a3dfd4484c26d55f8133345cefb5d5b9
author Austin Eng <enga@chromium.org> Tue Dec 03 21:25:45 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Dec 03 21:25:45 2019 +0000
tree 4f2f35d14f6a2091792066441f9c341ab0cbf288
parent ca5f61f9ed504e9c60a4126b0377e8b97fe8161c

Use GetBindGroupLayout in ComputeCopyStorageBufferTests

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

src/tests/end2end/ComputeCopyStorageBufferTests.cpp

diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp
index 02dbd59..055243b 100644
--- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp
+++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp
@@ -28,18 +28,10 @@
 };
 
 void ComputeCopyStorageBufferTests::BasicTest(const char* shader) {
-    auto bgl = utils::MakeBindGroupLayout(
-        device, {
-                    {0, wgpu::ShaderStage::Compute, wgpu::BindingType::StorageBuffer},
-                    {1, 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";
 
@@ -70,7 +62,7 @@
     dst.SetSubData(0, sizeof(zero), zero.data());
 
     // Set up bind group and issue dispatch
-    wgpu::BindGroup bindGroup = utils::MakeBindGroup(device, bgl,
+    wgpu::BindGroup bindGroup = utils::MakeBindGroup(device, pipeline.GetBindGroupLayout(0),
                                                      {
                                                          {0, src, 0, kNumUints * sizeof(uint32_t)},
                                                          {1, dst, 0, kNumUints * sizeof(uint32_t)},