Browse Source

Added debug output for Renderer error and reset status queries.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
4380e95a67
  1. 47
      src/Renderer.cpp
  2. 11
      src/Renderer.h
  3. 1
      src/Test/CMakeLists.txt
  4. 72
      src/Test/RendererTest.cpp

47
src/Renderer.cpp

@ -233,4 +233,51 @@ Renderer::GraphicsResetStatus Renderer::graphicsResetStatusImplementationRobustn
}
#endif
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug operator<<(Debug debug, const Renderer::Error value) {
switch(value) {
#define _c(value) case Renderer::Error::value: return debug << "Renderer::Error::" #value;
_c(NoError)
_c(InvalidEnum)
_c(InvalidValue)
_c(InvalidOperation)
_c(InvalidFramebufferOperation)
_c(OutOfMemory)
#ifndef MAGNUM_TARGET_GLES3
_c(StackUnderflow)
_c(StackOverflow)
#endif
#undef _c
}
return debug << "Renderer::Error::(invalid)";
}
#ifndef MAGNUM_TARGET_GLES3
Debug operator<<(Debug debug, const Renderer::ResetNotificationStrategy value) {
switch(value) {
#define _c(value) case Renderer::ResetNotificationStrategy::value: return debug << "Renderer::ResetNotificationStrategy::" #value;
_c(NoResetNotification)
_c(LoseContextOnReset)
#undef _c
}
return debug << "Renderer::ResetNotificationStrategy::(invalid)";
}
Debug operator<<(Debug debug, const Renderer::GraphicsResetStatus value) {
switch(value) {
#define _c(value) case Renderer::GraphicsResetStatus::value: return debug << "Renderer::GraphicsResetStatus::" #value;
_c(NoError)
_c(GuiltyContextReset)
_c(InnocentContextReset)
_c(UnknownContextReset)
#undef _c
}
return debug << "Renderer::ResetNotificationStrategy::(invalid)";
}
#endif
#endif
}

11
src/Renderer.h

@ -1043,6 +1043,17 @@ class MAGNUM_EXPORT Renderer {
#endif
};
/** @debugoperator{Renderer} */
Debug MAGNUM_EXPORT operator<<(Debug debug, Renderer::Error value);
#ifndef MAGNUM_TARGET_GLES3
/** @debugoperator{Renderer} */
Debug MAGNUM_EXPORT operator<<(Debug debug, Renderer::ResetNotificationStrategy value);
/** @debugoperator{Renderer} */
Debug MAGNUM_EXPORT operator<<(Debug debug, Renderer::GraphicsResetStatus value);
#endif
}
#endif

1
src/Test/CMakeLists.txt

@ -27,6 +27,7 @@ corrade_add_test(AbstractShaderProgramTest AbstractShaderProgramTest.cpp LIBRARI
corrade_add_test(ArrayTest ArrayTest.cpp)
corrade_add_test(ColorTest ColorTest.cpp LIBRARIES MagnumMathTestLib)
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(SwizzleTest SwizzleTest.cpp LIBRARIES MagnumMathTestLib)

72
src/Test/RendererTest.cpp

@ -0,0 +1,72 @@
/*
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 "Renderer.h"
namespace Magnum { namespace Test {
class RendererTest: public TestSuite::Tester {
public:
explicit RendererTest();
void debugError();
#ifndef MAGNUM_TARGET_GLES3
void debugResetNotificationStrategy();
void debugGraphicsResetStatus();
#endif
};
RendererTest::RendererTest() {
addTests({&RendererTest::debugError});
}
void RendererTest::debugError() {
std::ostringstream out;
Debug(&out) << Renderer::Error::InvalidOperation;
CORRADE_COMPARE(out.str(), "Renderer::Error::InvalidOperation\n");
}
#ifndef MAGNUM_TARGET_GLES3
void RendererTest::debugResetNotificationStrategy() {
std::ostringstream out;
Debug(&out) << Renderer::ResetNotificationStrategy::LoseContextOnReset;
CORRADE_COMPARE(out.str(), "Renderer::ResetNotificationStrategy::LoseContextOnReset\n");
}
void RendererTest::debugGraphicsResetStatus() {
std::ostringstream out;
Debug(&out) << Renderer::GraphicsResetStatus::GuiltyContextReset;
CORRADE_COMPARE(out.str(), "Renderer::GraphicsResetStatus::GuiltyContextReset\n");
}
#endif
}}
CORRADE_TEST_MAIN(Magnum::Test::RendererTest)
Loading…
Cancel
Save