Browse Source

Ability to print Shader::Type enum to Debug output.

pull/51/head
Vladimír Vondruš 13 years ago
parent
commit
a4aad89cfb
  1. 19
      src/Shader.cpp
  2. 3
      src/Shader.h
  3. 1
      src/Test/CMakeLists.txt
  4. 52
      src/Test/ShaderTest.cpp

19
src/Shader.cpp

@ -682,4 +682,23 @@ bool Shader::compile() {
return success;
}
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug operator<<(Debug debug, const Shader::Type value) {
switch(value) {
#define _c(value) case Shader::Type::value: return debug << "Shader::Type::" #value;
_c(Vertex)
#ifndef MAGNUM_TARGET_GLES
_c(TessellationControl)
_c(TessellationEvaluation)
_c(Geometry)
_c(Compute)
#endif
_c(Fragment)
#undef _c
}
return debug << "Shader::Type::(invalid)";
}
#endif
}

3
src/Shader.h

@ -522,6 +522,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
std::vector<std::string> sources;
};
/** @debugoperator{Magnum::Shader} */
Debug MAGNUM_EXPORT operator<<(Debug debug, Shader::Type value);
}
#endif

1
src/Test/CMakeLists.txt

@ -35,6 +35,7 @@ corrade_add_test(MeshTest MeshTest.cpp LIBRARIES Magnum)
corrade_add_test(RendererTest RendererTest.cpp LIBRARIES Magnum)
corrade_add_test(ResourceManagerTest ResourceManagerTest.cpp LIBRARIES MagnumTestLib)
corrade_add_test(SamplerTest SamplerTest.cpp LIBRARIES Magnum)
corrade_add_test(ShaderTest ShaderTest.cpp LIBRARIES Magnum)
if(BUILD_GL_TESTS)
corrade_add_test(AbstractObjectGLTest AbstractObjectGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})

52
src/Test/ShaderTest.cpp

@ -0,0 +1,52 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <sstream>
#include <TestSuite/Tester.h>
#include "Shader.h"
namespace Magnum { namespace Test {
class ShaderTest: public TestSuite::Tester {
public:
explicit ShaderTest();
void debugType();
};
ShaderTest::ShaderTest() {
addTests({&ShaderTest::debugType});
}
void ShaderTest::debugType() {
std::ostringstream out;
Debug(&out) << Shader::Type::Fragment;
CORRADE_COMPARE(out.str(), "Shader::Type::Fragment\n");
}
}}
CORRADE_TEST_MAIN(Magnum::Test::ShaderTest)
Loading…
Cancel
Save