Merge lp:~georg-zotti/stellarium/gz_shaderloader-message into lp:stellarium

[gzotti]

Better OpenGL diagnostics handling. Some folks are unhappy to look into the logfile after a crash on first run on old hardware. This branch adds some GUI message panels in case of critical errors. The panels can be closed, accepting degraded operation. A new command line switch has been added to suppress the panels and continue operation in case of uncritical errors.

Proper operation of this patch can best be tested on old hardware which is known to NOT run properly, like NVidia 6xxx/7xxx, older AMD, older Intel with OpenGL2.1 but missing functions. I would like to have a 32bit Win install package for testing on two such old PCs before merge.

[lp:~georg-zotti/stellarium/gz_shaderloader-message]

7110. By gzotti on 2014-10-27

merge from trunk at r7108

[Fabien Chéreau (xalioth)]

I don't really like this patch:
 - it adds GUI dependencies to deep engine code which should be strictly avoided
 - adding some pop ups in case of failure doesn't add value compared to a normal crash
 - I don't think it's even good you can ask the user whether he wants to continue in this case, he just cannot know. We have to decide for him if an error is critical or not. If it's critical we crash, if not we continue.
 - we should find a more elegant, generic and robust way to deal with crashes or opengl failure, for example by displaying logs in a window just before quitting in case of crash

review: Disapprove

[gzotti (georg-zotti)]

OK, this was just following that user request. If I take out the panels, the added tests may still be valuable. Else, we forget it.

Just that I have an Intel office PC with almost working OpenGL2.1 that just has that problem with the semitransparent box bounded by the menu slide-outs in lower left of the display in Night mode. I don't know if one of the compile/link/bind methods would return false on this. It works, but not fully, and it should therefore not simply crash. This and similar would benefit from the new command line switch by not failing completely.

Unmerged revisions

7110. By gzotti on 2014-10-27

merge from trunk at r7108

7109. By gzotti on 2014-10-27

added new CLI flag --ignore-opengl-errors to suppress shader warning panels.

7108. By gzotti on 2014-10-27

More OpenGL shader compilation diagnostics with Messagebox indicating problems in case of OpenGL shader compilation errors.
Also fixed Planet deinit()

=== modified file 'src/CLIProcessor.cpp'
--- src/CLIProcessor.cpp	2014-09-12 11:42:59 +0000
+++ src/CLIProcessor.cpp	2014-10-27 19:09:08 +0000
@@ -56,6 +56,7 @@
 			  //<< "--safe-mode (or -s)     : Disable GL shaders and use older GL engine\n"
 			  << "--dump-opengl-details (or -d) : dump information about OpenGL support to logfile\n"
 			  << "                          Try this is you have graphics problems\n"
+			  << "--ignore-opengl-errors  : Suppress warning panels, ignore errors\n"
 		          << "--full-screen (or -f)   : With argument \"yes\" or \"no\" over-rides\n"
 		          << "                          the full screen setting in the config file\n"
 		          << "--screenshot-dir        : Specify directory to save screenshots\n"
@@ -123,6 +124,8 @@
 	{
 		bool dumpOpenGLDetails = argsGetOption(argList, "-d", "--dump-opengl-details");
 		qApp->setProperty("dump_OpenGL_details", dumpOpenGLDetails);
+		bool ignoreOpenGLErrors = argsGetOption(argList, "", "--ignore-opengl-errors");
+		qApp->setProperty("ignore_OpenGL_errors", ignoreOpenGLErrors);
 		fullScreen = argsGetYesNoOption(argList, "-f", "--full-screen", -1);
 		landscapeId = argsGetOptionWithArg(argList, "", "--landscape", "").toString();
 		homePlanet = argsGetOptionWithArg(argList, "", "--home-planet", "").toString();

=== modified file 'src/core/StelPainter.cpp'
--- src/core/StelPainter.cpp	2014-06-06 04:26:56 +0000
+++ src/core/StelPainter.cpp	2014-10-27 19:09:08 +0000
@@ -25,6 +25,7 @@
 #include "StelProjectorClasses.hpp"
 #include "StelUtils.hpp"
 
+#include <QApplication>
 #include <QDebug>
 #include <QString>
 #include <QSettings>
@@ -36,7 +37,7 @@
 #include <QCache>
 #include <QOpenGLPaintDevice>
 #include <QOpenGLShader>
-
+#include <QMessageBox>
 
 #ifndef NDEBUG
 QMutex* StelPainter::globalMutex = new QMutex();
@@ -73,14 +74,6 @@
 	}
 }
 
-bool StelPainter::linkProg(QOpenGLShaderProgram* prog, const QString& name)
-{
-	bool ret = prog->link();
-	if (!ret || (!prog->log().isEmpty() && !prog->log().contains("Link was successful")))
-		qWarning() << QString("StelPainter: Warnings while linking %1 shader program:\n%2").arg(name, prog->log());
-	return ret;
-}
-
 StelPainter::StelPainter(const StelProjectorP& proj) : prj(proj)
 {
 	Q_ASSERT(proj);
@@ -1552,6 +1545,33 @@
 	texture2dEnabled = b;
 }
 
+
+
+bool StelPainter::compileShader(QOpenGLShader* shader, const char* src, const char* name)
+{
+	bool ret=shader->compileSourceCode(src);
+	if ((!ret) && !shader->log().isEmpty()) { qWarning() << "StelPainter: Warnings while compiling " << name << ": " << shader->log(); }
+	return ret;
+}
+
+bool StelPainter::addShaders(QOpenGLShaderProgram* prog, QOpenGLShader* vshader, const char* vShaderName, QOpenGLShader* fshader, const char* fShaderName)
+{
+	bool retv=prog->addShader(vshader);
+	if (!retv)  { qWarning() << "StelPainter: Error while adding " << vShaderName; }
+	bool retf=prog->addShader(fshader);
+	if (!retf)  { qWarning() << "StelPainter: Error while adding " << fShaderName; }
+	return retv && retf;
+}
+
+bool StelPainter::linkProg(QOpenGLShaderProgram* prog, const QString& name)
+{
+	bool ret = prog->link();
+	if (!ret || (!prog->log().isEmpty() && !prog->log().contains("Link was successful")))
+		qWarning() << QString("StelPainter: Warnings while linking %1 shader program:\n%2").arg(name, prog->log());
+	return ret;
+}
+
+
 void StelPainter::initGLShaders()
 {
 	qWarning() << "Intializing basic GL shaders... ";
@@ -1564,8 +1584,6 @@
 		"{\n"
 		"    gl_Position = projectionMatrix*vec4(vertex, 1.);\n"
 		"}\n";
-	vshader3.compileSourceCode(vsrc3);
-	if (!vshader3.log().isEmpty()) { qWarning() << "StelPainter: Warnings while compiling vshader3: " << vshader3.log(); }
 	QOpenGLShader fshader3(QOpenGLShader::Fragment);
 	const char *fsrc3 =
 		"uniform mediump vec4 color;\n"
@@ -1573,16 +1591,28 @@
 		"{\n"
 		"    gl_FragColor = color;\n"
 		"}\n";
-	fshader3.compileSourceCode(fsrc3);
-	if (!fshader3.log().isEmpty()) { qWarning() << "StelPainter: Warnings while compiling fshader3: " << fshader3.log(); }
 	basicShaderProgram = new QOpenGLShaderProgram(QOpenGLContext::currentContext());
-	basicShaderProgram->addShader(&vshader3);
-	basicShaderProgram->addShader(&fshader3);
-	linkProg(basicShaderProgram, "basicShaderProgram");
+	if (!(	compileShader(&vshader3, vsrc3, "vshader3") &&
+		compileShader(&fshader3, fsrc3, "fshader3") &&
+		addShaders(basicShaderProgram, &vshader3, "vshader3", &fshader3, "fshader3") &&
+		linkProg(basicShaderProgram, "basicShaderProgram")) &&
+		!qApp->property("ignore_OpenGL_errors").toBool() )
+	{
+		// Error handling: Show GUI panel "Ignore possible problems?"
+		QMessageBox::StandardButton answerButton=
+				QMessageBox::critical(0, q_("Stellarium: OpenGL Errors"),
+					q_("Your OpenGL subsystem has problems. See log for details.\nIgnore and try to continue in degraded mode anyway?"),
+					QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+		if (answerButton == QMessageBox::Abort)
+		{
+			qDebug() << "Aborting due to OpenGL initialization problems.";
+			StelApp::getInstance().quit(); // Seems not to be enough(?)
+			exit(0);
+		}
+	}
 	basicShaderVars.projectionMatrix = basicShaderProgram->uniformLocation("projectionMatrix");
 	basicShaderVars.color = basicShaderProgram->uniformLocation("color");
 	basicShaderVars.vertex = basicShaderProgram->attributeLocation("vertex");
-	
 
 	// Basic shader: vertex filled with interpolated color
 	QOpenGLShader vshaderInterpolatedColor(QOpenGLShader::Vertex);
@@ -1596,10 +1626,6 @@
 		"    gl_Position = projectionMatrix*vec4(vertex, 1.);\n"
 		"    fragcolor = color;\n"
 		"}\n";
-	vshaderInterpolatedColor.compileSourceCode(vshaderInterpolatedColorSrc);
-	if (!vshaderInterpolatedColor.log().isEmpty()) {
-	  qWarning() << "StelPainter: Warnings while compiling vshaderInterpolatedColor: " << vshaderInterpolatedColor.log();
-	}
 	QOpenGLShader fshaderInterpolatedColor(QOpenGLShader::Fragment);
 	const char *fshaderInterpolatedColorSrc =
 		"varying mediump vec4 fragcolor;\n"
@@ -1607,14 +1633,25 @@
 		"{\n"
 		"    gl_FragColor = fragcolor;\n"
 		"}\n";
-	fshaderInterpolatedColor.compileSourceCode(fshaderInterpolatedColorSrc);
-	if (!fshaderInterpolatedColor.log().isEmpty()) {
-	  qWarning() << "StelPainter: Warnings while compiling fshaderInterpolatedColor: " << fshaderInterpolatedColor.log();
-	}
 	colorShaderProgram = new QOpenGLShaderProgram(QOpenGLContext::currentContext());
-	colorShaderProgram->addShader(&vshaderInterpolatedColor);
-	colorShaderProgram->addShader(&fshaderInterpolatedColor);
-	linkProg(colorShaderProgram, "colorShaderProgram");
+	if (!(  compileShader(&vshaderInterpolatedColor, vshaderInterpolatedColorSrc, "vshaderInterpolatedColor") &&
+		compileShader(&fshaderInterpolatedColor, fshaderInterpolatedColorSrc, "fshaderInterpolatedColor") &&
+		addShaders(colorShaderProgram, &vshaderInterpolatedColor, "vshaderInterpolatedColor", &fshaderInterpolatedColor, "fshaderInterpolatedColor") &&
+		linkProg(colorShaderProgram, "colorShaderProgram")) &&
+		!qApp->property("ignore_OpenGL_errors").toBool() )
+	{
+		// Error handling: Show GUI panel "Ignore possible problems?"
+		QMessageBox::StandardButton answerButton=
+				QMessageBox::critical(0, q_("Stellarium: OpenGL Errors"),
+					q_("Your OpenGL subsystem has problems. See log for details.\nIgnore and try to continue in degraded mode anyway?"),
+					QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+		if (answerButton == QMessageBox::Abort)
+		{
+			qDebug() << "Aborting due to OpenGL initialization problems.";
+			StelApp::getInstance().quit(); // Seems not to be enough(?)
+			exit(0);
+		}
+	}
 	colorShaderVars.projectionMatrix = colorShaderProgram->uniformLocation("projectionMatrix");
 	colorShaderVars.color = colorShaderProgram->attributeLocation("color");
 	colorShaderVars.vertex = colorShaderProgram->attributeLocation("vertex");
@@ -1631,9 +1668,6 @@
 		"    gl_Position = projectionMatrix * vec4(vertex, 1.);\n"
 		"    texc = texCoord;\n"
 		"}\n";
-	vshader2.compileSourceCode(vsrc2);
-	if (!vshader2.log().isEmpty()) { qWarning() << "StelPainter: Warnings while compiling vshader2: " << vshader2.log(); }
-
 	QOpenGLShader fshader2(QOpenGLShader::Fragment);
 	const char *fsrc2 =
 		"varying mediump vec2 texc;\n"
@@ -1643,13 +1677,26 @@
 		"{\n"
 		"    gl_FragColor = texture2D(tex, texc)*texColor;\n"
 		"}\n";
-	fshader2.compileSourceCode(fsrc2);
-	if (!fshader2.log().isEmpty()) { qWarning() << "StelPainter: Warnings while compiling fshader2: " << fshader2.log(); }
-
 	texturesShaderProgram = new QOpenGLShaderProgram(QOpenGLContext::currentContext());
-	texturesShaderProgram->addShader(&vshader2);
-	texturesShaderProgram->addShader(&fshader2);
-	linkProg(texturesShaderProgram, "texturesShaderProgram");
+	if (!(  compileShader(&vshader2, vsrc2, "vshader2") &&
+		compileShader(&fshader2, fsrc2, "fshader2") &&
+		addShaders(texturesShaderProgram, &vshader2, "vshader2", &fshader2, "fshader2") &&
+		linkProg(texturesShaderProgram, "texturesShaderProgram")) &&
+		!qApp->property("ignore_OpenGL_errors").toBool() )
+	{
+		// Error handling: Show GUI panel "Ignore possible problems?"
+		QMessageBox::StandardButton answerButton=
+				QMessageBox::critical(0, q_("Stellarium: OpenGL Errors"),
+					q_("Your OpenGL subsystem has problems. See log for details.\nIgnore and try to continue in degraded mode anyway?"),
+					QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+		if (answerButton == QMessageBox::Abort)
+		{
+			qDebug() << "Aborting due to OpenGL initialization problems.";
+			StelApp::getInstance().quit(); // Seems not to be enough(?)
+			exit(0);
+		}
+	}
+
 	texturesShaderVars.projectionMatrix = texturesShaderProgram->uniformLocation("projectionMatrix");
 	texturesShaderVars.texCoord = texturesShaderProgram->attributeLocation("texCoord");
 	texturesShaderVars.vertex = texturesShaderProgram->attributeLocation("vertex");
@@ -1671,9 +1718,6 @@
 		"    texc = texCoord;\n"
 		"    outColor = color;\n"
 		"}\n";
-	vshader4.compileSourceCode(vsrc4);
-	if (!vshader4.log().isEmpty()) { qWarning() << "StelPainter: Warnings while compiling vshader4: " << vshader4.log(); }
-
 	QOpenGLShader fshader4(QOpenGLShader::Fragment);
 	const char *fsrc4 =
 		"varying mediump vec2 texc;\n"
@@ -1683,13 +1727,25 @@
 		"{\n"
 		"    gl_FragColor = texture2D(tex, texc)*outColor;\n"
 		"}\n";
-	fshader4.compileSourceCode(fsrc4);
-	if (!fshader4.log().isEmpty()) { qWarning() << "StelPainter: Warnings while compiling fshader4: " << fshader4.log(); }
-
 	texturesColorShaderProgram = new QOpenGLShaderProgram(QOpenGLContext::currentContext());
-	texturesColorShaderProgram->addShader(&vshader4);
-	texturesColorShaderProgram->addShader(&fshader4);
-	linkProg(texturesColorShaderProgram, "texturesColorShaderProgram");
+	if (!(  compileShader(&vshader4, vsrc4, "vshader4") &&
+		compileShader(&fshader4, fsrc4, "fshader4") &&
+		addShaders(texturesColorShaderProgram, &vshader4, "vshader4", &fshader4, "fshader4") &&
+		linkProg(texturesColorShaderProgram, "texturesColorShaderProgram")) &&
+		!qApp->property("ignore_OpenGL_errors").toBool() )
+	{
+		// Error handling: Show GUI panel "Ignore possible problems?"
+		QMessageBox::StandardButton answerButton=
+				QMessageBox::critical(0, q_("Stellarium: OpenGL Errors"),
+					q_("Your OpenGL subsystem has problems. See log for details.\nIgnore and try to continue in degraded mode anyway?"),
+					QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+		if (answerButton == QMessageBox::Abort)
+		{
+			qDebug() << "Aborting due to OpenGL initialization problems.";
+			StelApp::getInstance().quit(); // Seems not to be enough(?)
+			exit(0);
+		}
+	}
 	texturesColorShaderVars.projectionMatrix = texturesColorShaderProgram->uniformLocation("projectionMatrix");
 	texturesColorShaderVars.texCoord = texturesColorShaderProgram->attributeLocation("texCoord");
 	texturesColorShaderVars.vertex = texturesColorShaderProgram->attributeLocation("vertex");

=== modified file 'src/core/StelPainter.hpp'
--- src/core/StelPainter.hpp	2014-06-10 19:20:20 +0000
+++ src/core/StelPainter.hpp	2014-10-27 19:09:08 +0000
@@ -263,7 +263,14 @@
 	//! @param checkDiscontinuity will check and suppress discontinuities if necessary.
 	void drawStelVertexArray(const StelVertexArray& arr, const bool checkDiscontinuity=true);
 
-	//! Link an opengl program and show a message in case of error or warnings.
+	// A few wrapper functions to make code better readable
+	//! Compile an OpenGL shader and log a message in case of error or warnings.
+	//! @return true if the compilation was successful.
+	static bool compileShader(class QOpenGLShader* shader, const char* src, const char *name);
+	//! Add a compiled OpenGL program and log a message in case of error or warnings.
+	//! @return true if the addition was successful.
+	static bool addShaders(class QOpenGLShaderProgram* prog, class QOpenGLShader* vshader, const char *vShaderName, class QOpenGLShader* fshader, const char *fShaderName);
+	//! Link an OpenGL program (after addition of all compiled programs) and log a message in case of error or warnings.
 	//! @return true if the link was successful.
 	static bool linkProg(class QOpenGLShaderProgram* prog, const QString& name);
 

=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2014-10-27 16:19:19 +0000
+++ src/core/modules/Planet.cpp	2014-10-27 19:09:08 +0000
@@ -37,12 +37,14 @@
 #include "StelOpenGL.hpp"
 
 #include <iomanip>
+#include <QApplication>
 #include <QTextStream>
 #include <QString>
 #include <QDebug>
 #include <QVarLengthArray>
 #include <QOpenGLContext>
 #include <QOpenGLShader>
+#include <QMessageBox>
 
 Vec3f Planet::labelColor = Vec3f(0.4,0.4,0.8);
 Vec3f Planet::orbitColor = Vec3f(1,0.6,1);
@@ -1165,20 +1167,31 @@
 		"    }\n"
 		"}\n";
 	
+	bool planetShaderInitSuccessful;
 	// Default planet shader program
 	QOpenGLShader vshader(QOpenGLShader::Vertex);
-	vshader.compileSourceCode(vsrc);
-	if (!vshader.log().isEmpty()) { qWarning() << "Planet: Warnings while compiling vshader: " << vshader.log(); }
-	
+	bool result=vshader.compileSourceCode(vsrc);
+	if (!result) { qWarning() << "Planet: Warnings while compiling vshader: " << vshader.log(); }
+	planetShaderInitSuccessful=result;
+
 	QOpenGLShader fshader(QOpenGLShader::Fragment);
-	fshader.compileSourceCode(fsrc);
-	if (!fshader.log().isEmpty()) { qWarning() << "Planet: Warnings while compiling fshader: " << fshader.log(); }
+	result=fshader.compileSourceCode(fsrc);
+	if (!result) { qWarning() << "Planet: Warnings while compiling fshader: " << fshader.log(); }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
 
 	planetShaderProgram = new QOpenGLShaderProgram(QOpenGLContext::currentContext());
-	planetShaderProgram->addShader(&vshader);
-	planetShaderProgram->addShader(&fshader);
-	GL(StelPainter::linkProg(planetShaderProgram, "planetShaderProgram"));
-	GL(planetShaderProgram->bind());
+	result=planetShaderProgram->addShader(&vshader);
+	if (!result) { qWarning() << "Planet: Error while adding vshader: "; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	result=planetShaderProgram->addShader(&fshader);
+	if (!result) { qWarning() << "Planet: Error while adding fshader: "; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	GL(result=StelPainter::linkProg(planetShaderProgram, "planetShaderProgram"));
+	if (!result) { qWarning() << "Planet: Error linking planetShaderprogram"; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	GL(result=planetShaderProgram->bind());
+	if (!result) { qWarning() << "Planet: Error binding planetShaderprogram"; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
 	planetShaderVars.initLocations(planetShaderProgram);
 	GL(planetShaderProgram->release());
 	
@@ -1186,14 +1199,23 @@
 	QByteArray arr = "#define RINGS_SUPPORT\n\n";
 	arr+=fsrc;
 	QOpenGLShader ringFragmentShader(QOpenGLShader::Fragment);
-	ringFragmentShader.compileSourceCode(arr.constData());
-	if (!ringFragmentShader.log().isEmpty()) { qWarning() << "Planet: Warnings while compiling ringFragmentShader: " << ringFragmentShader.log(); }
+	result=ringFragmentShader.compileSourceCode(arr.constData());
+	if (!result) { qWarning() << "Planet: Warnings while compiling ringFragmentShader: " << ringFragmentShader.log(); }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
 
 	ringPlanetShaderProgram = new QOpenGLShaderProgram(QOpenGLContext::currentContext());
-	ringPlanetShaderProgram->addShader(&vshader);
-	ringPlanetShaderProgram->addShader(&ringFragmentShader);
-	GL(StelPainter::linkProg(ringPlanetShaderProgram, "ringPlanetShaderProgram"));
-	GL(ringPlanetShaderProgram->bind());
+	result=ringPlanetShaderProgram->addShader(&vshader);
+	if (!result) { qWarning() << "Planet: Error while adding vshader to ringPlanetShaderProgram."; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	result=ringPlanetShaderProgram->addShader(&ringFragmentShader);
+	if (!result) { qWarning() << "Planet: Error while adding ringFragmentShader."; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	GL(result=StelPainter::linkProg(ringPlanetShaderProgram, "ringPlanetShaderProgram"));
+	if (!result) { qWarning() << "Planet: Error linking ringPlanetShaderprogram"; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	GL(result=ringPlanetShaderProgram->bind());
+	if (!result) { qWarning() << "Planet: Error binding ringPlanetShaderprogram"; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
 	ringPlanetShaderVars.initLocations(ringPlanetShaderProgram);
 	GL(ringPlanetShaderVars.isRing = ringPlanetShaderProgram->uniformLocation("isRing"));
 	GL(ringPlanetShaderVars.ring = ringPlanetShaderProgram->uniformLocation("ring"));
@@ -1206,30 +1228,59 @@
 	arr = "#define IS_MOON\n\n";
 	arr+=vsrc;
 	QOpenGLShader moonVertexShader(QOpenGLShader::Vertex);
-	moonVertexShader.compileSourceCode(arr.constData());
-	if (!moonVertexShader.log().isEmpty()) { qWarning() << "Planet: Warnings while compiling moonVertexShader: " << moonVertexShader.log(); }
-	
+	result=moonVertexShader.compileSourceCode(arr.constData());
+	if (!result) { qWarning() << "Planet: Warnings while compiling moonVertexShader: " << moonVertexShader.log(); }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+
 	arr = "#define IS_MOON\n\n";
 	arr+=fsrc;
 	QOpenGLShader moonFragmentShader(QOpenGLShader::Fragment);
-	moonFragmentShader.compileSourceCode(arr.constData());
-	if (!moonFragmentShader.log().isEmpty()) { qWarning() << "Planet: Warnings while compiling moonFragmentShader: " << moonFragmentShader.log(); }
+	result=moonFragmentShader.compileSourceCode(arr.constData());
+	if (!result) { qWarning() << "Planet: Warnings while compiling moonFragmentShader: " << moonFragmentShader.log(); }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
 
 	moonShaderProgram = new QOpenGLShaderProgram(QOpenGLContext::currentContext());
-	moonShaderProgram->addShader(&moonVertexShader);
-	moonShaderProgram->addShader(&moonFragmentShader);
-	GL(StelPainter::linkProg(moonShaderProgram, "moonPlanetShaderProgram"));
-	GL(moonShaderProgram->bind());
+	result=moonShaderProgram->addShader(&moonVertexShader);
+	if (!result) { qWarning() << "Planet: Error while adding moonVertexShader."; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	result=moonShaderProgram->addShader(&moonFragmentShader);
+	if (!result) { qWarning() << "Planet: Error while adding moonFragmentShader."; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	GL(result=StelPainter::linkProg(moonShaderProgram, "moonPlanetShaderProgram"));
+	if (!result) { qWarning() << "Planet: Error linking moonPlanetShaderprogram"; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
+	GL(result=moonShaderProgram->bind());
+	if (!result) { qWarning() << "Planet: Error binding moonPlanetShaderprogram"; }
+	planetShaderInitSuccessful=planetShaderInitSuccessful && result;
 	moonShaderVars.initLocations(moonShaderProgram);
 	GL(moonShaderVars.earthShadow = moonShaderProgram->uniformLocation("earthShadow"));
 	GL(moonShaderVars.normalMap = moonShaderProgram->uniformLocation("normalMap"));
 	GL(moonShaderProgram->release());
+
+	if ((!planetShaderInitSuccessful) && (!qApp->property("ignore_OpenGL_errors").toBool()))
+	{
+		// Error handling: Show GUI panel "Ignore possible problems?"
+		QMessageBox::StandardButton answerButton=
+				QMessageBox::critical(0, q_("Stellarium: OpenGL Errors"),
+					q_("Your OpenGL subsystem has problems. See log for details.\nIgnore and try to continue in degraded mode anyway?"),
+					QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+		if (answerButton == QMessageBox::Abort)
+		{
+			qDebug() << "Aborting due to OpenGL initialization problems.";
+			StelApp::getInstance().quit(); // Seems not to be enough(?)
+			exit(0);
+		}
+	}
 }
 
 void Planet::deinitShader()
 {
 	delete planetShaderProgram;
 	planetShaderProgram = NULL;
+	delete ringPlanetShaderProgram;
+	ringPlanetShaderProgram = NULL;
+	delete moonShaderProgram;
+	moonShaderProgram = NULL;
 }
 
 void Planet::draw3dModel(StelCore* core, StelProjector::ModelViewTranformP transfo, float screenSz, bool drawOnlyRing)

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-09-27 11:37:20 +0000
+++ src/main.cpp	2014-10-27 19:09:08 +0000
@@ -349,21 +349,20 @@
 	// some basic diagnostics
 	if (!QGLFormat::hasOpenGL()){
 		qWarning() << "Oops... This system does not support OpenGL.";
-		QMessageBox::warning(0, "Stellarium", q_("This system does not support OpenGL."));
+		QMessageBox::critical(0, "Stellarium", q_("This system does not support OpenGL."), QMessageBox::Abort, QMessageBox::Abort);
 		appCanRun = false;
 	}
-
-	if (!(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_1) && !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0)) // Check supported version of OpenGL
+	else if (!(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_1) && !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0)) // Check supported version of OpenGL
 	{
 		// OK, minimal required version of OpenGL is 2.1 and OpenGL Shading Language is 1.20 (or OpenGL ES is 2.0 and GLSL ES is 2.0).
 		// Recommended OpenGL 3.0 and OpenGL Shading Language 1.30 and above.
 		// If platform does not support this version then say to user about troubles and quit from application.
 		#ifdef Q_OS_WIN
 		qWarning() << "Oops... Insufficient OpenGL version. Please update drivers, graphics hardware, or use MESA (or ANGLE) version.";
-		QMessageBox::warning(0, "Stellarium", q_("Insufficient OpenGL version. Please update drivers, graphics hardware, or use MESA (or ANGLE) version."));
+		QMessageBox::critical(0, "Stellarium", q_("Insufficient OpenGL version. Please update drivers, graphics hardware, or use MESA (or ANGLE) version."), QMessageBox::Abort, QMessageBox::Abort);
 		#else
 		qWarning() << "Oops... Insufficient OpenGL version. Please update drivers, or graphics hardware.";
-		QMessageBox::warning(0, "Stellarium", q_("Insufficient OpenGL version. Please update drivers, or graphics hardware."));
+		QMessageBox::critical(0, "Stellarium", q_("Insufficient OpenGL version. Please update drivers, or graphics hardware."), QMessageBox::Abort, QMessageBox::Abort);
 		#endif
 		appCanRun = false;
 	}