encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant RenderPass in Dawn unittests 

This patch removes all the redundant creations of RenderPass in Dawn
unittests. In these tests render passes are actually never used.

BUG=dawn:6

Change-Id: I6301a150ea21af1a7ccc3b7ce2dd78351eb7e179
Reviewed-on: https://dawn-review.googlesource.com/c/4720
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
This commit is contained in:
Jiawei Shao 2019-02-14 23:51:18 +00:00 committed by Commit Bot service account
parent 1541c8ba7a
commit e7bb3fd119
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/unittests/validation/InputStateValidationTests.cpp
View File

@ -20,8 +20,6 @@
class InputStateTest : public ValidationTest { class InputStateTest : public ValidationTest {
protected: protected:
void CreatePipeline(bool success, const dawn::InputState& inputState, std::string vertexSource) { void CreatePipeline(bool success, const dawn::InputState& inputState, std::string vertexSource) {
DummyRenderPass renderpassData = CreateDummyRenderPass();
dawn::ShaderModule vsModule = utils::CreateShaderModule(device, dawn::ShaderStage::Vertex, vertexSource.c_str()); dawn::ShaderModule vsModule = utils::CreateShaderModule(device, dawn::ShaderStage::Vertex, vertexSource.c_str());
dawn::ShaderModule fsModule = utils::CreateShaderModule(device, dawn::ShaderStage::Fragment, R"( dawn::ShaderModule fsModule = utils::CreateShaderModule(device, dawn::ShaderStage::Fragment, R"(
#version 450 #version 450
@ -35,7 +33,7 @@ class InputStateTest : public ValidationTest {
descriptor.cVertexStage.module = vsModule; descriptor.cVertexStage.module = vsModule;
descriptor.cFragmentStage.module = fsModule; descriptor.cFragmentStage.module = fsModule;
descriptor.inputState = inputState; descriptor.inputState = inputState;
descriptor.cColorAttachments[0]->format = renderpassData.attachmentFormat; descriptor.cColorAttachments[0]->format = dawn::TextureFormat::R8G8B8A8Unorm;
if (!success) { if (!success) {
ASSERT_DEVICE_ERROR(device.CreateRenderPipeline(&descriptor)); ASSERT_DEVICE_ERROR(device.CreateRenderPipeline(&descriptor));

1
src/tests/unittests/validation/QueueSubmitValidationTests.cpp
View File

@ -44,7 +44,6 @@ TEST_F(QueueSubmitValidationTest, SubmitWithMappedBuffer) {
// Create a command buffer that reads from the mappable buffer. // Create a command buffer that reads from the mappable buffer.
dawn::CommandBuffer commands; dawn::CommandBuffer commands;
{ {
dawn::RenderPassDescriptor renderpass = CreateSimpleRenderPass();
dawn::CommandBufferBuilder builder = device.CreateCommandBufferBuilder(); dawn::CommandBufferBuilder builder = device.CreateCommandBufferBuilder();
builder.CopyBufferToBuffer(buffer, 0, targetBuffer, 0, 4); builder.CopyBufferToBuffer(buffer, 0, targetBuffer, 0, 4);
commands = builder.GetResult(); commands = builder.GetResult();

3
src/tests/unittests/validation/RenderPipelineValidationTests.cpp
View File

@ -23,8 +23,6 @@ class RenderPipelineValidationTest : public ValidationTest {
void SetUp() override { void SetUp() override {
ValidationTest::SetUp(); ValidationTest::SetUp();
renderpass = CreateSimpleRenderPass();
vsModule = utils::CreateShaderModule(device, dawn::ShaderStage::Vertex, R"( vsModule = utils::CreateShaderModule(device, dawn::ShaderStage::Vertex, R"(
#version 450 #version 450
void main() { void main() {
@ -40,7 +38,6 @@ class RenderPipelineValidationTest : public ValidationTest {
})"); })");
} }
dawn::RenderPassDescriptor renderpass;
dawn::ShaderModule vsModule; dawn::ShaderModule vsModule;
dawn::ShaderModule fsModule; dawn::ShaderModule fsModule;
}; };