Browse Source

Adapted to Corrade changes.

pull/132/head
Vladimír Vondruš 10 years ago
parent
commit
26b51ad614
  1. 4
      src/Magnum/AbstractShaderProgram.cpp
  2. 4
      src/Magnum/Shader.cpp
  3. 8
      src/Magnum/Test/AbstractOpenGLTester.h

4
src/Magnum/AbstractShaderProgram.cpp

@ -406,7 +406,7 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
/* Show error log */ /* Show error log */
if(!success) { if(!success) {
auto out = Error::noNewlineAtTheEnd(); Error out{Debug::Flag::NoNewlineAtTheEnd};
out << "AbstractShaderProgram::link(): linking"; out << "AbstractShaderProgram::link(): linking";
if(shaders.size() != 1) { if(shaders.size() != 1) {
#if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
@ -419,7 +419,7 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
/* Or just warnings, if any */ /* Or just warnings, if any */
} else if(!message.empty() && !Implementation::isProgramLinkLogEmpty(message)) { } else if(!message.empty() && !Implementation::isProgramLinkLogEmpty(message)) {
auto out = Warning::noNewlineAtTheEnd(); Warning out{Debug::Flag::NoNewlineAtTheEnd};
out << "AbstractShaderProgram::link(): linking"; out << "AbstractShaderProgram::link(): linking";
if(shaders.size() != 1) { if(shaders.size() != 1) {
#if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)

4
src/Magnum/Shader.cpp

@ -856,7 +856,7 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
/* Show error log */ /* Show error log */
if(!success) { if(!success) {
auto out = Error::noNewlineAtTheEnd(); Error out{Debug::Flag::NoNewlineAtTheEnd};
out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader"; out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader";
if(shaders.size() != 1) { if(shaders.size() != 1) {
#if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
@ -869,7 +869,7 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
/* Or just warnings, if any */ /* Or just warnings, if any */
} else if(!message.empty() && !Implementation::isShaderCompilationLogEmpty(message)) { } else if(!message.empty() && !Implementation::isShaderCompilationLogEmpty(message)) {
auto out = Warning::noNewlineAtTheEnd(); Warning out{Debug::Flag::NoNewlineAtTheEnd};
out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader"; out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader";
if(shaders.size() != 1) { if(shaders.size() != 1) {
#if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)

8
src/Magnum/Test/AbstractOpenGLTester.h

@ -66,7 +66,7 @@ class AbstractOpenGLTester: public TestSuite::Tester {
} _windowlessApplication; } _windowlessApplication;
}; };
AbstractOpenGLTester::AbstractOpenGLTester(): _windowlessApplication{*_windowlessApplicationArguments} { AbstractOpenGLTester::AbstractOpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{*_windowlessApplicationArguments} {
/* Try to create debug context, fallback to normal one if not possible. No /* Try to create debug context, fallback to normal one if not possible. No
such thing on OSX. */ such thing on OSX. */
#ifndef CORRADE_TARGET_APPLE #ifndef CORRADE_TARGET_APPLE
@ -96,7 +96,7 @@ std::optional<Platform::WindowlessApplication::Arguments> AbstractOpenGLTester::
Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv); \ Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv); \
Class t; \ Class t; \
t.registerTest(__FILE__, #Class); \ t.registerTest(__FILE__, #Class); \
return t.exec(); \ return t.exec(argc, argv); \
} }
#else #else
#define MAGNUM_GL_TEST_MAIN(Class) \ #define MAGNUM_GL_TEST_MAIN(Class) \
@ -109,7 +109,9 @@ std::optional<Platform::WindowlessApplication::Arguments> AbstractOpenGLTester::
Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->window = hWnd; \ Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->window = hWnd; \
Class t; \ Class t; \
t.registerTest(__FILE__, #Class); \ t.registerTest(__FILE__, #Class); \
PostQuitMessage(ret = t.exec()); \ PostQuitMessage(ret = t.exec( \
Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->argc, \
Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->argv)); \
} \ } \
break; \ break; \
default: return DefWindowProc(hWnd, message, wParam, lParam); \ default: return DefWindowProc(hWnd, message, wParam, lParam); \

Loading…
Cancel
Save