mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop-main.cpp: add verbose output to validateGL()

Browse source 
Amend validateGL() with verbose output.
Also use QDebug instead of fprintf().

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-10-29 21:11:05 +02:00 committed by Dirk Hohndel
parent c88b59392b
commit 182992fad5
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
subsurface-desktop-main.cpp
View file

@ -51,8 +51,6 @@ int main(int argc, char **argv)
subsurface_console_init(dedicated_console, false); subsurface_console_init(dedicated_console, false);
} }
validateGL();
const char *default_directory = system_default_directory(); const char *default_directory = system_default_directory();
const char *default_filename = system_default_filename(); const char *default_filename = system_default_filename();
subsurface_mkdir(default_directory); subsurface_mkdir(default_directory);
@ -77,6 +75,7 @@ int main(int argc, char **argv)
printf("If you insist to do so, run with option --allow_run_as_root.\n"); printf("If you insist to do so, run with option --allow_run_as_root.\n");
exit(0); exit(0);
} }
validateGL();
#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR < 22 #if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR < 22
git_threads_init(); git_threads_init();
#else #else
@ -137,6 +136,8 @@ bool haveFilesOnCommandLine()
return filesOnCommandLine; return filesOnCommandLine;
} }
#define VALIDATE_GL_PREFIX "validateGL(): "
void validateGL() void validateGL()
{ {
GLint verMajor, verMinor; GLint verMajor, verMinor;
@ -151,30 +152,37 @@ void validateGL()
glError = "Cannot create OpenGL context"; glError = "Cannot create OpenGL context";
goto exit; goto exit;
} }
if (verbose)
qDebug() << QStringLiteral(VALIDATE_GL_PREFIX "created OpenGLContext.").toUtf8().data();
ctx.makeCurrent(&surface); ctx.makeCurrent(&surface);
func = ctx.functions(); func = ctx.functions();
if (!func) { if (!func) {
glError = "Cannot obtain QOpenGLFunctions"; glError = "Cannot obtain QOpenGLFunctions";
goto exit; goto exit;
} }
if (verbose)
qDebug() << QStringLiteral(VALIDATE_GL_PREFIX "obtained QOpenGLFunctions.").toUtf8().data();
func->glGetIntegerv(GL_MAJOR_VERSION, &verMajor); func->glGetIntegerv(GL_MAJOR_VERSION, &verMajor);
func->glGetIntegerv(GL_MINOR_VERSION, &verMinor); func->glGetIntegerv(GL_MINOR_VERSION, &verMinor);
if (verMajor * 10 + verMinor < 21) // set 2.1 as the minimal version if (verbose)
qDebug() << QStringLiteral(VALIDATE_GL_PREFIX "detected OpenGL version %1.%2.").arg(verMajor).arg(verMinor).toUtf8().data();
if (verMajor * 10 + verMinor < 21) { // set 2.1 as the minimal version
glError = "OpenGL 2.1 or later is required"; glError = "OpenGL 2.1 or later is required";
goto exit;
}
exit: exit:
ctx.makeCurrent(NULL); ctx.makeCurrent(NULL);
surface.destroy(); surface.destroy();
if (glError) { if (glError) {
#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
fprintf(stderr, "ERROR: %s.\n" qWarning() << QStringLiteral(VALIDATE_GL_PREFIX "ERROR: %1.\n"
"Cannot automatically fallback to a software renderer!\n" "Cannot automatically fallback to a software renderer!\n"
"Set the environment variable 'QT_QUICK_BACKEND' with the value of 'software'\n" "Set the environment variable 'QT_QUICK_BACKEND' with the value of 'software'\n"
"before running Subsurface!\n", "before running Subsurface!").arg(glError).toUtf8().data();
glError);
exit(0); exit(0);
#else #else
fprintf(stderr, "WARNING: %s. Using a software renderer!\n", glError); qWarning() << QStringLiteral(VALIDATE_GL_PREFIX "WARNING: %1. Using a software renderer!").arg(glError).toUtf8().data();
QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software); QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
#endif #endif
} }