Merge lp:~stellarium/stellarium/gz_insufficient-shader-level into lp:stellarium

[Alexander Wolf]

[Fabien Chéreau (xalioth)]

It's fine for me, but it would be good to also allow user to click on something like "Understood, don't show me this again" which will set the option in the config file

review: Needs Fixing

[gzotti (georg-zotti)]

OK, I changed this from command line option to config.ini setting.

I don't see a "Run Once" option in the QMessagebox buttons (Ignore without saving), but this whole addition should just be enough to catch most "does not run", "black screen", etc. bug reports. What would be nice would be GLSL1.20 fallback planet shaders for OpenGL2.1-only systems. (No shadows, just Phong model.) I also wonder about the GLSL answer string on OpenGL ES2.0, I have no system to test.

review: Needs Resubmitting

[Fabien Chéreau (xalioth)]

Please also get rid of QGLFormat and related deprecated classes.

review: Needs Fixing

[gzotti (georg-zotti)]

OK, I could remove all QGLFormat things in the startup tests. But the context creation in StelMainView l.306 was something I did not dare touching. I cannot test the GLES tests, have no ANGLE build system here.

The old version is only commented away, I would remove it on merge.

review: Needs Resubmitting

[gzotti (georg-zotti)]

The only thing that remains appears to be changing the (Stel)QGLWidget and other QGL... classes. On http://qt-project.org/wiki/New-Features-in-Qt-5.4 you can read there will be a QOpenGLWidget to replace QGLWidget. I would prefer to make this (hopefully easy) change after Qt5.4 is out, and merge this now so that our test builds and RCs can be tested and diagnosed on the various hardware already now.

review: Needs Resubmitting

[Alexander Wolf (alexwolf)]

QOpenGLWidget & QGLWidget should be used with ifdef's IMHO (if we not set minimal Qt as 5.4.0)

[Alexander Wolf (alexwolf)]

Georg, what will happen when system will have no OpenGL support?

review: Needs Information

[gzotti (georg-zotti)]

I think we should require Qt5.4 as soon as it is out and when it does not break other things, given several announced advantages: Dynamic ANGLE, and indeed that new QOpenGLWidget, which is hopefully the simplest successor of the aged QGL stuff. Qt5.4 may appear in December (they are a bit behind schedule now). I could try a beta maybe around Nov22. That means for now, we don't have to find a big way around QGLWidget, when a solution is on the horizon.

If there is no OpenGL support at all, I am pretty sure StelMainView line 306 will already fail as it always should have failed. In line 307 a QGLcontext is created, but not verified. A test could be built in here according to Qt docs.
I cannot test this assumption however, as I did not have a completely non-OpenGL system since about 1998 to ever come into this situation. Very early in the new test sequence, I test for minimal version which should be enough at that point.
After moving to Qt5.4, we should quickly abandon QGL... classes, and rewrite also this part with more foolproofing.

[Alexander Wolf (alexwolf)]

Simple test for non-OpenGL work - x11vnc session. Line 306 in StelMainView will be give failure without OpenGL and application will be crash. It's bad behaviour IMHO - crash without any info about requirement of the OpenGL support.

[gzotti (georg-zotti)]

Sure, but this was never tested. The major concern of this branch is the
many bug reports after 0.13 about issues with half-working systems with
just OpenGL2.0, 2.1 without GLSL1.30, etc.

Do you want another crash panel around line 306? I can only copy/paste
code here from below (panel similar to OpenGL<2 below ), not test it.

[Alexander Wolf (alexwolf)]

It was tested on series 0.12 in Debian

[lp:~stellarium/stellarium/gz_insufficient-shader-level]

7121. By gzotti on 2014-11-11

added two more test for detection of obviously unusable systems.

[gzotti (georg-zotti)]

OK, it was not tested as of October 31.

Does the current version abort "nicely" with an abort panel and log message on x11vnc?

[lp:~stellarium/stellarium/gz_insufficient-shader-level]

7122. By gzotti on 2014-11-14

Reactivate 0.12 line smoothing for AngleMeasure and CompassMarks plugins and activate it for Gridline drawing on capable systems. It really looks better. Compilation should not fail on ANGLE or other OpenGLES builds.

[Alexander Wolf (alexwolf)]

It's OK for me now. Fabien?

review: Approve

[lp:~stellarium/stellarium/gz_insufficient-shader-level]

7123. By gzotti on 2014-11-16

Started migration towards QOpenGLwidget for Qt5.4. THIS COMPILES, BUT DOES NOT YET RUN!

[gzotti (georg-zotti)]

Wonderful. r7122 was ready-to-merge. I then tried to go further to get rid of QGL... classes as Fabien asked me. Sorry, I don't know what to do. In r7123 there is conditional compilation of new classes with Qt5.4, but these are not initialized properly, so it does not run yet. Merge r7122, or someone else please fix r7123, I stop here.

[lp:~stellarium/stellarium/gz_insufficient-shader-level]

7124. By gzotti on 2014-11-24

added a test for minimal Mesa version (10) if Mesa is used.
changed conditional compiling with the new QtOpenGL... classes from checking Qt version (>=5.4) to a single #define. Migration towards using these new classes is not finished, help wanted...

7125. By gzotti on 2014-11-24

merged with trunk r7172

[gzotti (georg-zotti)]

I merged with trunk. This is IMHO as good as tests can currently get us catching errors caused by insufficient graphics capabilities. Small addenda/changes are easily done in trunk. Also next stage of migrating to Qt5.4 classes can continue from here.

review: Needs Resubmitting

[Alexander Wolf (alexwolf)]

I think one #ifdef not required here but it ready to merge IMHO

review: Approve

[gzotti (georg-zotti)]

That #if is indeed necessary - Qt managed to rename the method in question (capital B!), at least for Qt5.4beta. Anyway, these #if-excluded sections must be changed for Qt5.4 (release) and later.

I don't know if Launchpad's "Resubmit" means "must be resubmitted" or "this is a resubmit". So I approve my branch...

review: Approve

[Alexander Wolf (alexwolf)]

Lanchpad has "Resumbit" (review type) and "Resubmit proposal" ;)

=== modified file 'plugins/AngleMeasure/src/AngleMeasure.cpp'
--- plugins/AngleMeasure/src/AngleMeasure.cpp	2014-11-12 17:30:09 +0000
+++ plugins/AngleMeasure/src/AngleMeasure.cpp	2014-11-24 19:29:55 +0000
@@ -220,6 +220,15 @@
 			}
 		}
 
+		glDisable(GL_TEXTURE_2D);
+		// OpenGL ES 2.0 doesn't have GL_LINE_SMOOTH. But it looks much better.
+		#ifdef GL_LINE_SMOOTH
+		if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+			glEnable(GL_LINE_SMOOTH);
+		#endif
+
+		glEnable(GL_BLEND);
+
 		// main line is a great circle
 		painter.setColor(lineColor[0], lineColor[1], lineColor[2], lineVisible.getInterstate());
 		if (frameType==StelCore::FrameEquinoxEqu)
@@ -237,7 +246,11 @@
 			// End lines
 			painter.drawGreatCircleArc(perp1StartPointHor, perp1EndPointHor, NULL);
 			painter.drawGreatCircleArc(perp2StartPointHor, perp2EndPointHor, NULL);
-		}		
+		}
+		#ifdef GL_LINE_SMOOTH
+		if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+			glDisable(GL_LINE_SMOOTH);
+		#endif
 	}
 	if (messageFader.getInterstate() > 0.000001f)
 	{

=== modified file 'plugins/CompassMarks/src/CompassMarks.cpp'
--- plugins/CompassMarks/src/CompassMarks.cpp	2014-11-12 17:30:09 +0000
+++ plugins/CompassMarks/src/CompassMarks.cpp	2014-11-24 19:29:55 +0000
@@ -132,6 +132,11 @@
 	glDisable(GL_TEXTURE_2D);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
+	// OpenGL ES 2.0 doesn't have GL_LINE_SMOOTH. But it looks much better.
+	#ifdef GL_LINE_SMOOTH
+	if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+		glEnable(GL_LINE_SMOOTH);
+	#endif
 
 	for(int i=0; i<360; i++)
 	{
@@ -162,6 +167,11 @@
 			//glEnable(GL_TEXTURE_2D);
 		}
 	}
+	// OpenGL ES 2.0 doesn't have GL_LINE_SMOOTH
+	#ifdef GL_LINE_SMOOTH
+	if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+		glDisable(GL_LINE_SMOOTH);
+	#endif
 	glDisable(GL_BLEND);
 	glEnable(GL_TEXTURE_2D);
 

=== modified file 'src/StelMainView.cpp'
--- src/StelMainView.cpp	2014-10-26 13:26:29 +0000
+++ src/StelMainView.cpp	2014-11-24 19:29:55 +0000
@@ -33,7 +33,11 @@
 #include <QDeclarativeItem>
 #include <QDebug>
 #include <QDir>
+#if STEL_USE_NEW_OPENGL_WIDGETS
+#include <QOpenGLWidget>
+#else
 #include <QGLWidget>
+#endif
 #include <QGuiApplication>
 #include <QFileInfo>
 #include <QIcon>
@@ -46,6 +50,7 @@
 #include <QTimer>
 #include <QWidget>
 #include <QWindow>
+#include <QMessageBox>
 #include <QDeclarativeContext>
 #ifdef Q_OS_WIN
 	#include <QPinchGesture>
@@ -238,12 +243,51 @@
 
 void StelGuiItem::onSizeChanged()
 {
-	// I whish I could find a way to let Qt automatically resize the widget
+    // I wish I could find a way to let Qt automatically resize the widget
 	// when the QDeclarativeItem size changes.
 	widget->setGeometry(0, 0, width(), height());
 	StelApp::getInstance().getGui()->forceRefreshGui();
 }
 
+
+#if STEL_USE_NEW_OPENGL_WIDGETS
+
+class StelQOpenGLWidget : public QOpenGLWidget
+{
+public:
+    StelQOpenGLWidget(QWidget* parent) : QOpenGLWidget(parent)
+    {
+	// TODO: Unclear if tese attributes make sense?
+	setAttribute(Qt::WA_PaintOnScreen);
+	setAttribute(Qt::WA_NoSystemBackground);
+	setAttribute(Qt::WA_OpaquePaintEvent);
+    }
+
+protected:
+    virtual void initializeGL()
+    {
+	qDebug() << "It appears this was never called?";
+	qDebug() << "OpenGL supported version: " << QString((char*)glGetString(GL_VERSION));
+
+	QOpenGLWidget::initializeGL();
+	this->makeCurrent(); // Do we need this?
+	// GZ I have no idea how to proceed, sorry.
+	QSurfaceFormat format=this->format();
+	qDebug() << "Current Format: " << this->format();
+	// TODO: Test something? The old tests may be obsolete as all OpenGL2 formats/contexts have these?
+    }
+    virtual void paintGL()
+    {
+	// TODO: what shall this do exactly?
+    }
+    virtual void resizeGL()
+    {
+	// TODO: what shall this do exactly?
+    }
+
+};
+
+#else
 class StelQGLWidget : public QGLWidget
 {
 public:
@@ -273,6 +317,8 @@
 	}
 
 };
+#endif
+
 
 StelMainView::StelMainView(QWidget* parent)
 	: QDeclarativeView(parent), gui(NULL),
@@ -301,9 +347,44 @@
 
 	lastEventTimeSec = 0;
 
+
+#if STEL_USE_NEW_OPENGL_WIDGETS
+	// Primary test for OpenGL existence
+	if (QSurfaceFormat::defaultFormat().majorVersion() < 2)
+	{
+		qWarning() << "No OpenGL 2 support on this system. Aborting.";
+		QMessageBox::critical(0, "Stellarium", q_("No OpenGL 2 found on this system. Please upgrade hardware or use MESA or an older version."), QMessageBox::Abort, QMessageBox::Abort);
+		exit(0);
+	}
+
+	//QSurfaceFormat format();
+	//// TBD: What options shall be default?
+	//QSurfaceFormat::setDefaultFormat(format);
+	////QOpenGLContext* context=new QOpenGLContext::create();
+	glWidget = new StelQOpenGLWidget(this);
+	//glWidget->setFormat(format);
+#else
+	// Primary test for OpenGL existence
+	if (QGLFormat::openGLVersionFlags() < QGLFormat::OpenGL_Version_2_1)
+	{
+		qWarning() << "No OpenGL 2.1 support on this system. Aborting.";
+		QMessageBox::critical(0, "Stellarium", q_("No OpenGL 2 found on this system. Please upgrade hardware or use MESA or an older version."), QMessageBox::Abort, QMessageBox::Abort);
+		exit(1);
+	}
+
 	// Create an openGL viewport
 	QGLFormat glFormat(QGL::StencilBuffer | QGL::DepthBuffer | QGL::DoubleBuffer);
-	glWidget = new StelQGLWidget(new QGLContext(glFormat), this);
+	QGLContext* context=new QGLContext(glFormat);
+
+	if (context->format() != glFormat)
+	{
+		qWarning() << "Cannot provide OpenGL context. Apparently insufficient OpenGL resources on this system.";
+		QMessageBox::critical(0, "Stellarium", q_("Cannot acquire necessary OpenGL resouces."), QMessageBox::Abort, QMessageBox::Abort);
+		exit(1);
+	}
+	glWidget = new StelQGLWidget(context, this);
+#endif
+
 	setViewport(glWidget);
 
 	// Workaround (see Bug #940638) Although we have already explicitly set
@@ -341,20 +422,256 @@
 	}
 	Q_ASSERT(gui);
 
+#if STEL_USE_NEW_OPENGL_WIDGETS
+	//glWidget->initializeGL(); // protected...
+	//Q_ASSERT(glWidget->isValid());
+#else
 	Q_ASSERT(glWidget->isValid());
 	glWidget->makeCurrent();
-
-	// Debug info about supported version of OpenGL and vendor/renderer
-	qDebug() << "OpenGL versions supported:" << getSupportedOpenGLVersion();
-	qDebug() << "Driver version string:" << QString(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
+#endif
+
+	// Find out lots of debug info about supported version of OpenGL and vendor/renderer
+	QOpenGLContext* context=QOpenGLContext::currentContext();
+	QSurfaceFormat format=context->format();
+
+	bool openGLerror=false;
+	if (format.renderableType()==QSurfaceFormat::OpenGL || format.renderableType()==QSurfaceFormat::OpenGLES)
+	{
+		qDebug() << "Detected:" << (format.renderableType()==QSurfaceFormat::OpenGL  ? "OpenGL" : "OpenGL ES" ) << QString("%1.%2").arg(format.majorVersion()).arg(format.minorVersion());
+	}
+	else
+	{
+		openGLerror=true;
+		qDebug() << "Neither OpenGL nor OpenGL ES detected: Unsupported Format!";
+	}
+
+	QString glDriver(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
+	qDebug() << "Driver version string:" << glDriver;
 	qDebug() << "GL vendor is" << QString(reinterpret_cast<const char*>(glGetString(GL_VENDOR)));
-	qDebug() << "GL renderer is" << QString(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
-	qDebug() << "GL Shading Language version is" << QString(reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
-	
+	QString glRenderer(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
+	qDebug() << "GL renderer is" << glRenderer;
+
+	// Minimal required version of OpenGL for Qt5 is 2.1 and OpenGL Shading Language may be 1.20 (or OpenGL ES is 2.0 and GLSL ES is 1.0).
+	// As of V0.13.0..1, we use GLSL 1.10/GLSL ES 1.00 (implicitly, by omitting version), but in case of using ANGLE we need ps_3 hardware.
+	// This means, usually systems with OpenGL3 support reported in the driver will work, those with reported 2.1 only will almost certainly fail.
+	// If platform does not even support minimal OpenGL version for Qt5, then tell the user about troubles and quit from application.
+	if ( openGLerror ||
+	     ((format.renderableType()==QSurfaceFormat::OpenGL  ) && (format.version() < QPair<int, int>(2, 1))) ||
+	     ((format.renderableType()==QSurfaceFormat::OpenGLES) && (format.version() < QPair<int, int>(2, 0)))  )
+	{
+		#ifdef Q_OS_WIN
+		qWarning() << "Oops... 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::critical(0, "Stellarium", q_("Insufficient OpenGL version. Please update drivers, or graphics hardware."), QMessageBox::Abort, QMessageBox::Abort);
+		#endif
+		exit(1);
+	}
+	// This call requires OpenGL2+.
+	QString glslString(reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
+	qDebug() << "GL Shading Language version is" << glslString;
+
 	// Only give extended info if called on command line, for diagnostic.
 	if (qApp->property("dump_OpenGL_details").toBool())
 		dumpOpenGLdiagnostics();
 
+#ifdef Q_OS_WIN
+	// If we have ANGLE, check esp. for insufficient ps_2 level.
+	if (glRenderer.startsWith("ANGLE"))
+	{
+		QRegExp angleVsPsRegExp(" vs_(\\d)_(\\d) ps_(\\d)_(\\d)");
+		int angleVSPSpos=angleVsPsRegExp.indexIn(glRenderer);
+
+		if (angleVSPSpos >-1)
+		{
+			float vsVersion=angleVsPsRegExp.cap(1).toFloat() + 0.1*angleVsPsRegExp.cap(2).toFloat();
+			float psVersion=angleVsPsRegExp.cap(3).toFloat() + 0.1*angleVsPsRegExp.cap(4).toFloat();
+			qDebug() << "VS Version Number after parsing: " << vsVersion;
+			qDebug() << "PS Version Number after parsing: " << psVersion;
+			if ((vsVersion<2.0) || (psVersion<3.0))
+			{
+				openGLerror=true;
+				qDebug() << "This is not enough: we need DirectX9 with vs_2_0 and ps_3_0 or later.";
+				qDebug() << "You should update graphics drivers, graphics hardware, or use the OpenGL-MESA version.";
+				qDebug() << "Else, please try to use an older version like 0.12.4, and try there with --safe-mode";
+
+				if (conf->value("main/ignore_opengl_warning", false).toBool())
+				{
+					qDebug() << "Config option main/ignore_opengl_warning found, continuing. Expect problems.";
+				}
+				else
+				{
+					qDebug() << "You can try to run in an unsupported degraded mode by ignoring the warning and continuing.";
+					qDebug() << "But more than likely problems will persist.";
+					QMessageBox::StandardButton answerButton=
+					QMessageBox::critical(0, "Stellarium", q_("Your DirectX/OpenGL ES subsystem has problems. See log for details.\nIgnore and suppress this notice in the future and try to continue in degraded mode anyway?"),
+							      QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+					if (answerButton == QMessageBox::Abort)
+					{
+						qDebug() << "Aborting due to ANGLE OpenGL ES / DirectX vs or ps version problems.";
+						exit(1);
+					}
+					else
+					{
+						qDebug() << "Ignoring all warnings, continuing without further question.";
+						conf->setValue("main/ignore_opengl_warning", true);
+					}
+				}
+			}
+			else
+				qDebug() << "vs/ps version is fine, we should not see a graphics problem.";
+		}
+		else
+		{
+			qDebug() << "Cannot parse ANGLE shader version string. This may indicate future problems.";
+			qDebug() << "Please send a bug report that includes this log file and states if Stellarium runs or has problems.";
+		}
+	}
+#endif
+
+	// Do a similar test for MESA: Ensure we have at least Mesa 10, Mesa 9 on FreeBSD (used for hardware-acceleration of AMD IGP) was reported to lose the stars.
+	if (glDriver.contains("Mesa", Qt::CaseInsensitive))
+	{
+		QRegExp mesaRegExp("Mesa (\\d+)\\.(\\d+)"); // we need only major version. Minor should always be here. Test?
+		int mesaPos=mesaRegExp.indexIn(glDriver);
+
+		if (mesaPos >-1)
+		{
+			float mesaVersion=mesaRegExp.cap(1).toFloat() + 0.1*mesaRegExp.cap(2).toFloat();
+			qDebug() << "MESA Version Number after parsing: " << mesaVersion;
+			if ((mesaVersion<10.0))
+			{
+				openGLerror=true;
+				qDebug() << "This is not enough: we need Mesa 10.0 or later.";
+				qDebug() << "You should update graphics drivers or graphics hardware.";
+				qDebug() << "Else, please try to use an older version like 0.12.4, and try there with --safe-mode";
+
+				if (conf->value("main/ignore_opengl_warning", false).toBool())
+				{
+					qDebug() << "Config option main/ignore_opengl_warning found, continuing. Expect problems.";
+				}
+				else
+				{
+					qDebug() << "You can try to run in an unsupported degraded mode by ignoring the warning and continuing.";
+					qDebug() << "But more than likely problems will persist.";
+					QMessageBox::StandardButton answerButton=
+					QMessageBox::critical(0, "Stellarium", q_("Your OpenGL/Mesa subsystem has problems. See log for details.\nIgnore and suppress this notice in the future and try to continue in degraded mode anyway?"),
+							      QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+					if (answerButton == QMessageBox::Abort)
+					{
+						qDebug() << "Aborting due to OpenGL/Mesa insufficient version problems.";
+						exit(1);
+					}
+					else
+					{
+						qDebug() << "Ignoring all warnings, continuing without further question.";
+						conf->setValue("main/ignore_opengl_warning", true);
+					}
+				}
+			}
+			else
+				qDebug() << "Mesa version is fine, we should not see a graphics problem.";
+		}
+		else
+		{
+			qDebug() << "Cannot parse Mesa Driver version string. This may indicate future problems.";
+			qDebug() << "Please send a bug report that includes this log file and states if Stellarium runs or has problems.";
+		}
+	}
+
+
+	// If GLSL version is less than 1.30 or GLSL ES 1.00, Stellarium cannot run properly. Depending on whatever driver/implementation details,
+	// Stellarium may crash or show only minor graphical errors. We show a soft-crash panel that can be suppressed by a startup option.
+	QRegExp glslRegExp("^(\\d\\.\\d\\d)");
+	int pos=glslRegExp.indexIn(glslString);
+	QRegExp glslesRegExp("ES (\\d\\.\\d\\d)");
+	int posES=glslesRegExp.indexIn(glslString);
+	if (pos >-1)
+	{
+		float glslVersion=glslRegExp.cap(1).toFloat();
+		qDebug() << "GLSL Version Number after parsing: " << glslVersion;
+		if (glslVersion<1.3)
+		{
+			openGLerror=true;
+			qDebug() << "This is not enough: we need GLSL1.30 or later.";
+			qDebug() << "You should update graphics drivers, graphics hardware, or use the MESA version.";
+			qDebug() << "Else, please try to use an older version like 0.12.4, and try there with --safe-mode";
+
+			if (conf->value("main/ignore_opengl_warning", false).toBool())
+			{
+				qDebug() << "Config option main/ignore_opengl_warning found, continuing. Expect problems.";
+			}
+			else
+			{
+				qDebug() << "You can try to run in an unsupported degraded mode by ignoring the warning and continuing.";
+				qDebug() << "But more than likely problems will persist.";
+				QMessageBox::StandardButton answerButton=
+				QMessageBox::critical(0, "Stellarium", q_("Your OpenGL subsystem has problems. See log for details.\nIgnore and suppress this notice in the future and try to continue in degraded mode anyway?"),
+						      QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+				if (answerButton == QMessageBox::Abort)
+				{
+					qDebug() << "Aborting due to OpenGL/GLSL version problems.";
+					exit(1);
+				}
+				else
+				{
+					qDebug() << "Ignoring all warnings, continuing without further question.";
+					conf->setValue("main/ignore_opengl_warning", true);
+				}
+			}
+		}
+		else
+			qDebug() << "GLSL version is fine, we should not see a graphics problem.";
+	}
+	else if (posES >-1)
+	{
+		float glslesVersion=glslesRegExp.cap(1).toFloat();
+		qDebug() << "GLSL ES Version Number after parsing: " << glslesVersion;
+		if (glslesVersion<1.0) // TBD: is this possible at all?
+		{
+			openGLerror=true;
+			qDebug() << "This is not enough: we need GLSL ES 1.00 or later.";
+			qDebug() << "You should update graphics drivers, graphics hardware, or use the OpenGL-MESA version.";
+			qDebug() << "Else, please try to use an older version like 0.12.4, and try there with --safe-mode";
+
+			if (conf->value("main/ignore_opengl_warning", false).toBool())
+			{
+				qDebug() << "Config option main/ignore_opengl_warning found, continuing. Expect problems.";
+			}
+			else
+			{
+				qDebug() << "You can try to run in an unsupported degraded mode by ignoring the warning and continuing.";
+				qDebug() << "But more than likely problems will persist.";
+				QMessageBox::StandardButton answerButton=
+				QMessageBox::critical(0, "Stellarium", q_("Your OpenGL ES subsystem has problems. See log for details.\nIgnore and suppress this notice in the future and try to continue in degraded mode anyway?"),
+						      QMessageBox::Ignore|QMessageBox::Abort, QMessageBox::Abort);
+				if (answerButton == QMessageBox::Abort)
+				{
+					qDebug() << "Aborting due to OpenGL ES/GLSL ES version problems.";
+					exit(1);
+				}
+				else
+				{
+					qDebug() << "Ignoring all warnings, continuing without further question.";
+					conf->setValue("main/ignore_opengl_warning", true);
+				}
+			}
+		}
+		else
+		{
+			if (openGLerror)
+				qDebug() << "GLSL ES version is OK, but there were previous errors, expect problems.";
+			else
+				qDebug() << "GLSL ES version is fine, we should not see a graphics problem.";
+		}
+	}
+	else
+	{
+		qDebug() << "Cannot parse GLSL (ES) version string. This may indicate future problems.";
+		qDebug() << "Please send a bug report that includes this log file and states if Stellarium works or has problems.";
+	}
+
 	stelApp= new StelApp();
 	stelApp->setGui(gui);
 	stelApp->init(conf);
@@ -406,55 +723,6 @@
 	startMainLoop();
 }
 
-QString StelMainView::getSupportedOpenGLVersion() const
-{
-	int version = QGLFormat::openGLVersionFlags();
-	QStringList ver;
-
-	if (version&QGLFormat::OpenGL_Version_1_1)
-		ver << "1.1";
-	if (version&QGLFormat::OpenGL_Version_1_2)
-		ver << "1.2";
-	if (version&QGLFormat::OpenGL_Version_1_3)
-		ver << "1.3";
-	if (version&QGLFormat::OpenGL_Version_1_4)
-		ver << "1.4";
-	if (version&QGLFormat::OpenGL_Version_1_5)
-		ver << "1.5";
-	if (version&QGLFormat::OpenGL_Version_2_0)
-		ver << "2.0";
-	if (version&QGLFormat::OpenGL_Version_2_1)
-		ver << "2.1";
-	if (version&QGLFormat::OpenGL_Version_3_0)
-		ver << "3.0";
-	if (version&QGLFormat::OpenGL_Version_3_1)
-		ver << "3.1";
-	if (version&QGLFormat::OpenGL_Version_3_2)
-		ver << "3.2";
-	if (version&QGLFormat::OpenGL_Version_3_3)
-		ver << "3.3";
-	if (version&QGLFormat::OpenGL_Version_4_0)
-		ver << "4.0";
-	if (version&QGLFormat::OpenGL_Version_4_1)
-		ver << "4.1";
-	if (version&QGLFormat::OpenGL_Version_4_2)
-		ver << "4.2";
-	if (version&QGLFormat::OpenGL_Version_4_3)
-		ver << "4.3";
-	if (version&QGLFormat::OpenGL_ES_CommonLite_Version_1_0)
-		ver << "1.0 (ES CL)";
-	if (version&QGLFormat::OpenGL_ES_CommonLite_Version_1_1)
-		ver << "1.1 (ES CL)";
-	if (version&QGLFormat::OpenGL_ES_Common_Version_1_0)
-		ver << "1.0 (ES C)";
-	if (version&QGLFormat::OpenGL_ES_Common_Version_1_1)
-		ver << "1.1 (ES C)";
-	if (version&QGLFormat::OpenGL_ES_Version_2_0)
-		ver << "2.0 (ES)";
-
-	return ver.join(", ");
-}
-
 void StelMainView::dumpOpenGLdiagnostics() const
 {
 	// GZ: Debug info about OpenGL capabilities.
@@ -507,6 +775,8 @@
 	QMapIterator<QString, QString> iter2(extensionMap);
 	while (iter2.hasNext())
 		qDebug() << " -" << iter2.next().key();
+	// Apparently EXT_gpu_shader4 is required for GLSL1.3. (http://en.wikipedia.org/wiki/OpenGL#OpenGL_3.0).
+	qDebug() << "EXT_gpu_shader4" << (extensionSet.contains(("EXT_gpu_shader4")) ? "present, OK." : "MISSING!");
 
 	QFunctionPointer programParameterPtr =context->getProcAddress("glProgramParameteri");
 	if (programParameterPtr == 0)
@@ -706,7 +976,11 @@
 void StelMainView::doScreenshot(void)
 {
 	QFileInfo shotDir;
+#if STEL_USE_NEW_OPENGL_WIDGETS
+	QImage im = glWidget->grabFramebuffer();
+#else
 	QImage im = glWidget->grabFrameBuffer();
+#endif
 	if (flagInvertScreenShotColors)
 		im.invertPixels();
 

=== modified file 'src/StelMainView.hpp'
--- src/StelMainView.hpp	2014-11-04 10:59:12 +0000
+++ src/StelMainView.hpp	2014-11-24 19:29:55 +0000
@@ -25,12 +25,22 @@
 #include <QEventLoop>
 #include <QOpenGLContext>
 
+// This define (only used here and in StelMainView.cpp) is temporarily used
+// to allow uncompromised compiling while the migration to the new QOpenGL... classes
+// has not been done. As soon as Qt5.4 is out, we should finish this migration process!
+#define STEL_USE_NEW_OPENGL_WIDGETS false
+
 class QDeclarativeItem;
+#if STEL_USE_NEW_OPENGL_WIDGETS
+class QOpenGLWidget;
+class StelQOpenGLWidget;
+#else
 class QGLWidget;
+class StelQGLWidget;
+#endif
 class QMoveEvent;
 class QResizeEvent;
 class StelGuiBase;
-class StelQGLWidget;
 class QMoveEvent;
 
 //! @class StelMainView
@@ -145,7 +155,6 @@
 	//! Start the display loop
 	void startMainLoop();
 	
-	QString getSupportedOpenGLVersion() const;
 	//! provide extensive OpenGL dignostics in logfile.
 	void dumpOpenGLdiagnostics() const;
 
@@ -158,7 +167,11 @@
 	QDeclarativeItem* skyItem;
 
 	//! The openGL window
+#if STEL_USE_NEW_OPENGL_WIDGETS
+	StelQOpenGLWidget* glWidget;
+#else
 	StelQGLWidget* glWidget;
+#endif
 	StelGuiBase* gui;
 	class StelApp* stelApp;
 

=== modified file 'src/core/StelOpenGL.hpp'
--- src/core/StelOpenGL.hpp	2014-09-12 11:36:20 +0000
+++ src/core/StelOpenGL.hpp	2014-11-24 19:29:55 +0000
@@ -149,6 +149,12 @@
 # define GL(line) line
 #endif
 
+// In ANGLE and other OpenGL ES systems, GL_LINE_SMOOTH is undefined.
+// We can define it here to not break compilation, but must test for real OpenGL context before calling.
+# ifndef GL_LINE_SMOOTH
+#  define GL_LINE_SMOOTH 0x0B20
+# endif
+
 const char* getGLErrorText(int code);
 int checkGLErrors(const char *file, int line);
 

=== modified file 'src/core/modules/GridLinesMgr.cpp'
--- src/core/modules/GridLinesMgr.cpp	2014-11-08 22:04:20 +0000
+++ src/core/modules/GridLinesMgr.cpp	2014-11-24 19:29:55 +0000
@@ -337,7 +337,7 @@
 	const SphericalCap& viewPortSphericalCap = prj->getBoundingCap();
 
 	// Compute the first grid starting point. This point is close to the center of the screen
-	// and lays at the intersection of a meridien and a parallel
+	// and lies at the intersection of a meridian and a parallel
 	lon2 = gridStepMeridianRad*((int)(lon2/gridStepMeridianRad+0.5));
 	lat2 = gridStepParallelRad*((int)(lat2/gridStepParallelRad+0.5));
 	Vec3d firstPoint;
@@ -346,10 +346,15 @@
 
 	// Q_ASSERT(viewPortSphericalCap.contains(firstPoint));
 
-	// Initialize a painter and set openGL state
+	// Initialize a painter and set OpenGL state
 	StelPainter sPainter(prj);
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
+	// OpenGL ES 2.0 doesn't have GL_LINE_SMOOTH
+	#ifdef GL_LINE_SMOOTH
+	if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+		glEnable(GL_LINE_SMOOTH);
+	#endif
 	Vec4f textColor(color[0], color[1], color[2], 0);
 	sPainter.setColor(color[0],color[1],color[2], fader.getInterstate());
 
@@ -547,6 +552,11 @@
 			fpt.transfo4d(rotLon);
 		}
 	}
+	// OpenGL ES 2.0 doesn't have GL_LINE_SMOOTH
+	#ifdef GL_LINE_SMOOTH
+	if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+		glDisable(GL_LINE_SMOOTH);
+	#endif
 }
 
 

=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2014-11-21 18:49:36 +0000
+++ src/core/modules/Planet.cpp	2014-11-24 19:29:55 +0000
@@ -1280,6 +1280,10 @@
 {
 	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-11-24 19:29:55 +0000
@@ -43,7 +43,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFontDatabase>
-#include <QGLFormat>
 #include <QGuiApplication>
 #include <QSettings>
 #include <QSplashScreen>
@@ -344,55 +343,24 @@
 	app.installTranslator(&trans);
 
 	StelMainView mainWin;
-
-	bool appCanRun = true;
-	// 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."));
-		appCanRun = false;
-	}
-
-	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."));
-		#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."));
-		#endif
-		appCanRun = false;
-	}
-
-	if (appCanRun)
-	{
-		mainWin.init(confSettings);
-		splash.finish(&mainWin);
-		app.exec();
-		mainWin.deinit();
-
-		delete confSettings;
-		StelLogger::deinit();
-
-		#ifdef Q_OS_WIN
-		if(timerGrain)
-			timeEndPeriod(timerGrain);
-		#endif //Q_OS_WIN
-		#ifdef Q_OS_MAC
-		delete(newArgv);
-		delete(option);
-		delete(value);
-		#endif
-
-		return 0;
-	}
-	else
-	{
-		app.quit();
-	}
+	mainWin.init(confSettings); // May exit(0) when OpenGL subsystem insufficient
+	splash.finish(&mainWin);
+	app.exec();
+	mainWin.deinit();
+
+	delete confSettings;
+	StelLogger::deinit();
+
+	#ifdef Q_OS_WIN
+	if(timerGrain)
+		timeEndPeriod(timerGrain);
+	#endif //Q_OS_WIN
+	#ifdef Q_OS_MAC
+	delete(newArgv);
+	delete(option);
+	delete(value);
+	#endif
+
+	return 0;
 }