diff --git a/src/Shaders/Test/CMakeLists.txt b/src/Shaders/Test/CMakeLists.txt index 1614b55d4..994bf925f 100644 --- a/src/Shaders/Test/CMakeLists.txt +++ b/src/Shaders/Test/CMakeLists.txt @@ -23,10 +23,10 @@ # if(BUILD_GL_TESTS) - corrade_add_test(ShadersDistanceFieldVectorGLTest DistanceFieldVectorTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) - corrade_add_test(ShadersFlatGLTest FlatTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) - corrade_add_test(ShadersMeshVisualizerGLTest MeshVisualizerTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) - corrade_add_test(ShadersPhongGLTest PhongTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) - corrade_add_test(ShadersVectorGLTest VectorTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) - corrade_add_test(ShadersVertexColorGLTest VertexColorTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) + corrade_add_test(ShadersDistanceFieldVectorGLTest DistanceFieldVectorGLTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) + corrade_add_test(ShadersFlatGLTest FlatGLTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) + corrade_add_test(ShadersMeshVisualizerGLTest MeshVisualizerGLTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) + corrade_add_test(ShadersPhongGLTest PhongGLTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) + corrade_add_test(ShadersVectorGLTest VectorGLTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) + corrade_add_test(ShadersVertexColorGLTest VertexColorGLTest.cpp LIBRARIES MagnumShaders ${GL_TEST_LIBRARIES}) endif() diff --git a/src/Shaders/Test/DistanceFieldVectorTest.cpp b/src/Shaders/Test/DistanceFieldVectorGLTest.cpp similarity index 78% rename from src/Shaders/Test/DistanceFieldVectorTest.cpp rename to src/Shaders/Test/DistanceFieldVectorGLTest.cpp index fe7323af3..0e6bc2598 100644 --- a/src/Shaders/Test/DistanceFieldVectorTest.cpp +++ b/src/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -27,29 +27,29 @@ namespace Magnum { namespace Shaders { namespace Test { -class DistanceFieldVectorTest: public Magnum::Test::AbstractOpenGLTester { +class DistanceFieldVectorGLTest: public Magnum::Test::AbstractOpenGLTester { public: - explicit DistanceFieldVectorTest(); + explicit DistanceFieldVectorGLTest(); void compile2D(); void compile3D(); }; -DistanceFieldVectorTest::DistanceFieldVectorTest() { - addTests({&DistanceFieldVectorTest::compile2D, - &DistanceFieldVectorTest::compile3D}); +DistanceFieldVectorGLTest::DistanceFieldVectorGLTest() { + addTests({&DistanceFieldVectorGLTest::compile2D, + &DistanceFieldVectorGLTest::compile3D}); } -void DistanceFieldVectorTest::compile2D() { +void DistanceFieldVectorGLTest::compile2D() { Shaders::DistanceFieldVector2D shader; CORRADE_VERIFY(shader.validate().first); } -void DistanceFieldVectorTest::compile3D() { +void DistanceFieldVectorGLTest::compile3D() { Shaders::DistanceFieldVector3D shader; CORRADE_VERIFY(shader.validate().first); } }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::DistanceFieldVectorTest) +CORRADE_TEST_MAIN(Magnum::Shaders::Test::DistanceFieldVectorGLTest) diff --git a/src/Shaders/Test/FlatTest.cpp b/src/Shaders/Test/FlatGLTest.cpp similarity index 79% rename from src/Shaders/Test/FlatTest.cpp rename to src/Shaders/Test/FlatGLTest.cpp index fd376a76c..08be1e375 100644 --- a/src/Shaders/Test/FlatTest.cpp +++ b/src/Shaders/Test/FlatGLTest.cpp @@ -27,9 +27,9 @@ namespace Magnum { namespace Shaders { namespace Test { -class FlatTest: public Magnum::Test::AbstractOpenGLTester { +class FlatGLTest: public Magnum::Test::AbstractOpenGLTester { public: - explicit FlatTest(); + explicit FlatGLTest(); void compile2D(); void compile3D(); @@ -37,33 +37,33 @@ class FlatTest: public Magnum::Test::AbstractOpenGLTester { void compile3DTextured(); }; -FlatTest::FlatTest() { - addTests({&FlatTest::compile2D, - &FlatTest::compile3D, - &FlatTest::compile2DTextured, - &FlatTest::compile3DTextured}); +FlatGLTest::FlatGLTest() { + addTests({&FlatGLTest::compile2D, + &FlatGLTest::compile3D, + &FlatGLTest::compile2DTextured, + &FlatGLTest::compile3DTextured}); } -void FlatTest::compile2D() { +void FlatGLTest::compile2D() { Shaders::Flat2D shader; CORRADE_VERIFY(shader.validate().first); } -void FlatTest::compile3D() { +void FlatGLTest::compile3D() { Shaders::Flat3D shader; CORRADE_VERIFY(shader.validate().first); } -void FlatTest::compile2DTextured() { +void FlatGLTest::compile2DTextured() { Shaders::Flat2D shader(Shaders::Flat2D::Flag::Textured); CORRADE_VERIFY(shader.validate().first); } -void FlatTest::compile3DTextured() { +void FlatGLTest::compile3DTextured() { Shaders::Flat3D shader(Shaders::Flat3D::Flag::Textured); CORRADE_VERIFY(shader.validate().first); } }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::FlatTest) +CORRADE_TEST_MAIN(Magnum::Shaders::Test::FlatGLTest) diff --git a/src/Shaders/Test/MeshVisualizerTest.cpp b/src/Shaders/Test/MeshVisualizerGLTest.cpp similarity index 79% rename from src/Shaders/Test/MeshVisualizerTest.cpp rename to src/Shaders/Test/MeshVisualizerGLTest.cpp index aa2740422..1b7b12c42 100644 --- a/src/Shaders/Test/MeshVisualizerTest.cpp +++ b/src/Shaders/Test/MeshVisualizerGLTest.cpp @@ -29,27 +29,27 @@ namespace Magnum { namespace Shaders { namespace Test { -class MeshVisualizerTest: public Magnum::Test::AbstractOpenGLTester { +class MeshVisualizerGLTest: public Magnum::Test::AbstractOpenGLTester { public: - explicit MeshVisualizerTest(); + explicit MeshVisualizerGLTest(); void compile(); void compileWireframeGeometryShader(); void compileWireframeNoGeometryShader(); }; -MeshVisualizerTest::MeshVisualizerTest() { - addTests({&MeshVisualizerTest::compile, - &MeshVisualizerTest::compileWireframeGeometryShader, - &MeshVisualizerTest::compileWireframeNoGeometryShader}); +MeshVisualizerGLTest::MeshVisualizerGLTest() { + addTests({&MeshVisualizerGLTest::compile, + &MeshVisualizerGLTest::compileWireframeGeometryShader, + &MeshVisualizerGLTest::compileWireframeNoGeometryShader}); } -void MeshVisualizerTest::compile() { +void MeshVisualizerGLTest::compile() { Shaders::MeshVisualizer shader; CORRADE_VERIFY(shader.validate().first); } -void MeshVisualizerTest::compileWireframeGeometryShader() { +void MeshVisualizerGLTest::compileWireframeGeometryShader() { #ifdef MAGNUM_TARGET_GLES CORRADE_SKIP("Geometry shader is not available in OpenGL ES"); #else @@ -61,11 +61,11 @@ void MeshVisualizerTest::compileWireframeGeometryShader() { #endif } -void MeshVisualizerTest::compileWireframeNoGeometryShader() { +void MeshVisualizerGLTest::compileWireframeNoGeometryShader() { Shaders::MeshVisualizer shader(Shaders::MeshVisualizer::Flag::Wireframe|Shaders::MeshVisualizer::Flag::NoGeometryShader); CORRADE_VERIFY(shader.validate().first); } }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::MeshVisualizerTest) +CORRADE_TEST_MAIN(Magnum::Shaders::Test::MeshVisualizerGLTest) diff --git a/src/Shaders/Test/PhongTest.cpp b/src/Shaders/Test/PhongGLTest.cpp similarity index 73% rename from src/Shaders/Test/PhongTest.cpp rename to src/Shaders/Test/PhongGLTest.cpp index 7b426b79f..5e6f79fa5 100644 --- a/src/Shaders/Test/PhongTest.cpp +++ b/src/Shaders/Test/PhongGLTest.cpp @@ -27,9 +27,9 @@ namespace Magnum { namespace Shaders { namespace Test { -class PhongTest: public Magnum::Test::AbstractOpenGLTester { +class PhongGLTest: public Magnum::Test::AbstractOpenGLTester { public: - explicit PhongTest(); + explicit PhongGLTest(); void compile(); void compileAmbientTexture(); @@ -41,57 +41,57 @@ class PhongTest: public Magnum::Test::AbstractOpenGLTester { void compileAmbientDiffuseSpecularTexture(); }; -PhongTest::PhongTest() { - addTests({&PhongTest::compile, - &PhongTest::compileAmbientTexture, - &PhongTest::compileDiffuseTexture, - &PhongTest::compileSpecularTexture, - &PhongTest::compileAmbientDiffuseTexture, - &PhongTest::compileAmbientSpecularTexture, - &PhongTest::compileDiffuseSpecularTexture, - &PhongTest::compileAmbientDiffuseSpecularTexture}); +PhongGLTest::PhongGLTest() { + addTests({&PhongGLTest::compile, + &PhongGLTest::compileAmbientTexture, + &PhongGLTest::compileDiffuseTexture, + &PhongGLTest::compileSpecularTexture, + &PhongGLTest::compileAmbientDiffuseTexture, + &PhongGLTest::compileAmbientSpecularTexture, + &PhongGLTest::compileDiffuseSpecularTexture, + &PhongGLTest::compileAmbientDiffuseSpecularTexture}); } -void PhongTest::compile() { +void PhongGLTest::compile() { Shaders::Phong shader; CORRADE_VERIFY(shader.validate().first); } -void PhongTest::compileAmbientTexture() { +void PhongGLTest::compileAmbientTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture); CORRADE_VERIFY(shader.validate().first); } -void PhongTest::compileDiffuseTexture() { +void PhongGLTest::compileDiffuseTexture() { Shaders::Phong shader(Shaders::Phong::Flag::DiffuseTexture); CORRADE_VERIFY(shader.validate().first); } -void PhongTest::compileSpecularTexture() { +void PhongGLTest::compileSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::SpecularTexture); CORRADE_VERIFY(shader.validate().first); } -void PhongTest::compileAmbientDiffuseTexture() { +void PhongGLTest::compileAmbientDiffuseTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture|Shaders::Phong::Flag::DiffuseTexture); CORRADE_VERIFY(shader.validate().first); } -void PhongTest::compileAmbientSpecularTexture() { +void PhongGLTest::compileAmbientSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture|Shaders::Phong::Flag::SpecularTexture); CORRADE_VERIFY(shader.validate().first); } -void PhongTest::compileDiffuseSpecularTexture() { +void PhongGLTest::compileDiffuseSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::DiffuseTexture|Shaders::Phong::Flag::SpecularTexture); CORRADE_VERIFY(shader.validate().first); } -void PhongTest::compileAmbientDiffuseSpecularTexture() { +void PhongGLTest::compileAmbientDiffuseSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture|Shaders::Phong::Flag::DiffuseTexture|Shaders::Phong::Flag::SpecularTexture); CORRADE_VERIFY(shader.validate().first); } }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::PhongTest) +CORRADE_TEST_MAIN(Magnum::Shaders::Test::PhongGLTest) diff --git a/src/Shaders/Test/VectorTest.cpp b/src/Shaders/Test/VectorGLTest.cpp similarity index 82% rename from src/Shaders/Test/VectorTest.cpp rename to src/Shaders/Test/VectorGLTest.cpp index 58b112900..ed187caab 100644 --- a/src/Shaders/Test/VectorTest.cpp +++ b/src/Shaders/Test/VectorGLTest.cpp @@ -27,29 +27,29 @@ namespace Magnum { namespace Shaders { namespace Test { -class VectorTest: public Magnum::Test::AbstractOpenGLTester { +class VectorGLTest: public Magnum::Test::AbstractOpenGLTester { public: - explicit VectorTest(); + explicit VectorGLTest(); void compile2D(); void compile3D(); }; -VectorTest::VectorTest() { - addTests({&VectorTest::compile2D, - &VectorTest::compile3D}); +VectorGLTest::VectorGLTest() { + addTests({&VectorGLTest::compile2D, + &VectorGLTest::compile3D}); } -void VectorTest::compile2D() { +void VectorGLTest::compile2D() { Shaders::Vector2D shader; CORRADE_VERIFY(shader.validate().first); } -void VectorTest::compile3D() { +void VectorGLTest::compile3D() { Shaders::Vector3D shader; CORRADE_VERIFY(shader.validate().first); } }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::VectorTest) +CORRADE_TEST_MAIN(Magnum::Shaders::Test::VectorGLTest) diff --git a/src/Shaders/Test/VertexColorTest.cpp b/src/Shaders/Test/VertexColorGLTest.cpp similarity index 80% rename from src/Shaders/Test/VertexColorTest.cpp rename to src/Shaders/Test/VertexColorGLTest.cpp index c20915b4d..e0e381d4f 100644 --- a/src/Shaders/Test/VertexColorTest.cpp +++ b/src/Shaders/Test/VertexColorGLTest.cpp @@ -27,29 +27,29 @@ namespace Magnum { namespace Shaders { namespace Test { -class VertexColorTest: public Magnum::Test::AbstractOpenGLTester { +class VertexColorGLTest: public Magnum::Test::AbstractOpenGLTester { public: - explicit VertexColorTest(); + explicit VertexColorGLTest(); void compile2D(); void compile3D(); }; -VertexColorTest::VertexColorTest() { - addTests({&VertexColorTest::compile2D, - &VertexColorTest::compile3D}); +VertexColorGLTest::VertexColorGLTest() { + addTests({&VertexColorGLTest::compile2D, + &VertexColorGLTest::compile3D}); } -void VertexColorTest::compile2D() { +void VertexColorGLTest::compile2D() { Shaders::VertexColor2D shader; CORRADE_VERIFY(shader.validate().first); } -void VertexColorTest::compile3D() { +void VertexColorGLTest::compile3D() { Shaders::VertexColor3D shader; CORRADE_VERIFY(shader.validate().first); } }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::VertexColorTest) +CORRADE_TEST_MAIN(Magnum::Shaders::Test::VertexColorGLTest) diff --git a/src/Test/CMakeLists.txt b/src/Test/CMakeLists.txt index bfe91f600..855cd581b 100644 --- a/src/Test/CMakeLists.txt +++ b/src/Test/CMakeLists.txt @@ -36,7 +36,7 @@ corrade_add_test(SamplerTest SamplerTest.cpp LIBRARIES Magnum) if(BUILD_GL_TESTS) corrade_add_test(BufferGLTest BufferGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) - corrade_add_test(ContextGLTest ContextTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) + corrade_add_test(ContextGLTest ContextGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) endif() set_target_properties(ResourceManagerTest PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) diff --git a/src/Test/ContextTest.cpp b/src/Test/ContextGLTest.cpp similarity index 88% rename from src/Test/ContextTest.cpp rename to src/Test/ContextGLTest.cpp index ba2a9cb22..f957e24fe 100644 --- a/src/Test/ContextTest.cpp +++ b/src/Test/ContextGLTest.cpp @@ -24,13 +24,13 @@ #include "Test/AbstractOpenGLTester.h" #include "Context.h" -#include +#include "Extensions.h" namespace Magnum { namespace Test { -class ContextTest: public AbstractOpenGLTester { +class ContextGLTest: public AbstractOpenGLTester { public: - explicit ContextTest(); + explicit ContextGLTest(); void version(); void versionList(); @@ -40,16 +40,16 @@ class ContextTest: public AbstractOpenGLTester { void versionDependentExtension(); }; -ContextTest::ContextTest() { - addTests({&ContextTest::version, - &ContextTest::versionList, - &ContextTest::supportedExtension, - &ContextTest::unsupportedExtension, - &ContextTest::pastExtension, - &ContextTest::versionDependentExtension}); +ContextGLTest::ContextGLTest() { + addTests({&ContextGLTest::version, + &ContextGLTest::versionList, + &ContextGLTest::supportedExtension, + &ContextGLTest::unsupportedExtension, + &ContextGLTest::pastExtension, + &ContextGLTest::versionDependentExtension}); } -void ContextTest::version() { +void ContextGLTest::version() { const Version v = Context::current()->version(); CORRADE_VERIFY(Context::current()->isVersionSupported(v)); CORRADE_VERIFY(Context::current()->isVersionSupported(Version(Int(v)-1))); @@ -60,7 +60,7 @@ void ContextTest::version() { MAGNUM_ASSERT_VERSION_SUPPORTED(Version(Int(v)-1)); } -void ContextTest::versionList() { +void ContextGLTest::versionList() { const Version v = Context::current()->version(); /* Selects first supported version (thus not necessarily the highest) */ @@ -68,7 +68,7 @@ void ContextTest::versionList() { CORRADE_VERIFY(Context::current()->supportedVersion({Version(Int(v)+1), Version(Int(v)-1), v}) == Version(Int(v)-1)); } -void ContextTest::supportedExtension() { +void ContextGLTest::supportedExtension() { if(!Context::current()->isExtensionSupported()) CORRADE_SKIP(Extensions::GL::EXT::texture_filter_anisotropic::string() + std::string(" extension should be supported, can't test")); @@ -76,7 +76,7 @@ void ContextTest::supportedExtension() { CORRADE_VERIFY(extensions.find(Extensions::GL::EXT::texture_filter_anisotropic::string()) != std::string::npos); } -void ContextTest::unsupportedExtension() { +void ContextGLTest::unsupportedExtension() { #ifndef MAGNUM_TARGET_GLES if(Context::current()->isExtensionSupported()) CORRADE_SKIP(Extensions::GL::GREMEDY::string_marker::string() + std::string(" extension shouldn't be supported, can't test")); @@ -98,7 +98,7 @@ void ContextTest::unsupportedExtension() { #endif } -void ContextTest::pastExtension() { +void ContextGLTest::pastExtension() { #ifndef MAGNUM_TARGET_GLES if(!Context::current()->isVersionSupported(Version::GL300)) CORRADE_SKIP("No already supported extensions exist in OpenGL 2.1"); @@ -116,7 +116,7 @@ void ContextTest::pastExtension() { #endif } -void ContextTest::versionDependentExtension() { +void ContextGLTest::versionDependentExtension() { #ifndef MAGNUM_TARGET_GLES CORRADE_COMPARE(Extensions::GL::ARB::get_program_binary::requiredVersion(), Version::GL300); if(!Context::current()->isExtensionSupported()) @@ -131,4 +131,4 @@ void ContextTest::versionDependentExtension() { }} -CORRADE_TEST_MAIN(Magnum::Test::ContextTest) +CORRADE_TEST_MAIN(Magnum::Test::ContextGLTest)