commit 1fe9979ad8867ec8f441214ec1433ff827dd7d39
author Austin Eng <enga@chromium.org> Tue Dec 03 21:32:55 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Dec 03 21:32:55 2019 +0000
tree 387427b953768b7ab51d8744e454ea2bf28596c9
parent da82324098c9e64497c6f546e670c4e081adbefc

Use GetBindGroupLayout in SamplerTests

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

src/tests/end2end/SamplerTests.cpp

diff --git a/src/tests/end2end/SamplerTests.cpp b/src/tests/end2end/SamplerTests.cpp
index 5593f91e..e058fb0 100644
--- a/src/tests/end2end/SamplerTests.cpp
+++ b/src/tests/end2end/SamplerTests.cpp
@@ -54,14 +54,6 @@
         DawnTest::TestSetUp();
         mRenderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 
-        mBindGroupLayout = utils::MakeBindGroupLayout(
-            device, {
-                        {0, wgpu::ShaderStage::Fragment, wgpu::BindingType::Sampler},
-                        {1, wgpu::ShaderStage::Fragment, wgpu::BindingType::SampledTexture},
-                    });
-
-        auto pipelineLayout = utils::MakeBasicPipelineLayout(device, &mBindGroupLayout);
-
         auto vsModule = utils::CreateShaderModule(device, utils::SingleShaderStage::Vertex, R"(
             #version 450
             void main() {
@@ -86,12 +78,12 @@
         )");
 
         utils::ComboRenderPipelineDescriptor pipelineDescriptor(device);
-        pipelineDescriptor.layout = pipelineLayout;
         pipelineDescriptor.vertexStage.module = vsModule;
         pipelineDescriptor.cFragmentStage.module = fsModule;
         pipelineDescriptor.cColorStates[0].format = mRenderPass.colorFormat;
 
         mPipeline = device.CreateRenderPipeline(&pipelineDescriptor);
+        mBindGroupLayout = mPipeline.GetBindGroupLayout(0);
 
         wgpu::TextureDescriptor descriptor;
         descriptor.dimension = wgpu::TextureDimension::e2D;