From 1fe9979ad8867ec8f441214ec1433ff827dd7d39 Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Tue, 3 Dec 2019 21:32:55 +0000 Subject: [PATCH] Use GetBindGroupLayout in SamplerTests Bug: dawn:276 Change-Id: I294a3e94e1134212cc8f9bccd743435a6cd67538 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/14030 Commit-Queue: Austin Eng Reviewed-by: Kai Ninomiya Reviewed-by: Corentin Wallez --- src/tests/end2end/SamplerTests.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/tests/end2end/SamplerTests.cpp b/src/tests/end2end/SamplerTests.cpp index 5593f91ed7..e058fb064f 100644 --- a/src/tests/end2end/SamplerTests.cpp +++ b/src/tests/end2end/SamplerTests.cpp @@ -54,14 +54,6 @@ protected: 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 @@ protected: )"); 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;