From: Peter Gal Date: Mon, 7 Sep 2015 08:26:41 +0000 (+0200) Subject: ShaderRenderCase: Move creation of tests to a separeate method X-Git-Tag: upstream/0.1.0~812^2~521^2~6^2~39 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=610c078adbf4a3dff4e682bc07a26fa42b3855bc;p=platform%2Fupstream%2FVK-GL-CTS.git ShaderRenderCase: Move creation of tests to a separeate method --- diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp index c9a104a..d8aefcb 100644 --- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp @@ -107,7 +107,6 @@ public: protected: virtual void setup (void) { - fprintf(stderr, "LOLOOLLLLL\n"); m_brickTexture = Texture2D::create(m_context, m_context.getTestContext().getArchive(), "data/brick.png"); m_textures.push_back(TextureBinding(m_brickTexture, tcu::Sampler(tcu::Sampler::CLAMP_TO_EDGE, tcu::Sampler::CLAMP_TO_EDGE, @@ -138,9 +137,9 @@ public: } }; -tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx) +static tcu::TestCaseGroup* dummyTests (tcu::TestContext& testCtx) { - de::MovePtr shaderRenderCaseTests (new tcu::TestCaseGroup(testCtx, "shaderRenderCase", "ShaderRenderCase Tests")); + de::MovePtr dummyTests (new tcu::TestCaseGroup(testCtx, "dummy", "Dummy ShaderRenderCase based Tests")); std::string base_vertex = "#version 140\n" "#extension GL_ARB_separate_shader_objects : enable\n" @@ -201,8 +200,17 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx) "void main (void) { o_color = texture(tex, v_coords.xy); }\n"; - shaderRenderCaseTests->addChild(new DummyTestRenderCase(testCtx, "testVertex", "testVertex", true, evalCoordsPassthrough, base_vertex, base_fragment)); - shaderRenderCaseTests->addChild(new DummyTestRenderCase(testCtx, "testFragment", "testFragment", false, eval_DEBUG_TEX, base_vertex, debug_fragment)); + dummyTests->addChild(new DummyTestRenderCase(testCtx, "testVertex", "testVertex", true, evalCoordsPassthrough, base_vertex, base_fragment)); + dummyTests->addChild(new DummyTestRenderCase(testCtx, "testFragment", "testFragment", false, eval_DEBUG_TEX, base_vertex, debug_fragment)); + + return dummyTests.release(); +} + +tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx) +{ + de::MovePtr shaderRenderCaseTests (new tcu::TestCaseGroup(testCtx, "shaderRenderCase", "ShaderRenderCase Tests")); + + shaderRenderCaseTests->addChild(dummyTests(testCtx)); return shaderRenderCaseTests.release(); }