Merge lp:~stellarium/stellarium/gz-opengl-init into lp:stellarium

[gzotti]

Added optional more startup diagnostics for tracking down OpenGL-related issues.

[Alexander Wolf (alexwolf)]

I think CLI option should be --dump-opengl-details instead --opengldetails

[lp:~stellarium/stellarium/gz-opengl-init]

6949. By gzotti on 2014-09-12

typofix, bad function name.

[Alexander Wolf (alexwolf)]

Hm... Maybe it should be short --debug?

[Fabien Chéreau (xalioth)]

Please fix whitespaces

review: Needs Fixing

[lp:~stellarium/stellarium/gz-opengl-init]

6950. By gzotti on 2014-09-12

renamed command-line option

[gzotti (georg-zotti)]

We may consider a more global --debug option, this could give OpenGL and other extended messages. I saw this qApp->property() trick to check...

@ Fabien: sorry, I don't see which? Or do you mean those double-spaces that are formed from assembling the strings? If this is an issue, how do I elegantly prevent "NOT" becoming " NOT " in the "<<" concatenation?

[gzotti (georg-zotti)]

@ Fabien sorry, I just saw the detailed comments in the mail. I did not touch that, must have happened during merge.

[Fabien Chéreau (xalioth)]

No I mean the chnages in bool StelSkyItem::event(QEvent * e) ....
There is no visible changes here, so it must be line ending or white spaces..

[gzotti (georg-zotti)]

@ Fabien: I can only guess it's the usual Linux/Windows line-ending thing where BZR (or QtCreator?) apparently injects a CRLF on (my) Windows and diff marks those lines changed. These lines are new functions that came in during latest merge with trunk.

[Fabien Chéreau (xalioth)]

OK, then the culprit is in the other patch..

On Fri, Sep 12, 2014 at 2:04 PM, gzotti <email address hidden> wrote:

> @ Fabien: I can only guess it's the usual Linux/Windows line-ending thing
> where BZR (or QtCreator?) apparently injects a CRLF on (my) Windows and
> diff marks those lines changed. These lines are new functions that came in
> during latest merge with trunk.
> --
>
> https://code.launchpad.net/~stellarium/stellarium/gz-opengl-init/+merge/234455
> You are reviewing the proposed merge of
> lp:~stellarium/stellarium/gz-opengl-init into lp:stellarium.
>

[gzotti (georg-zotti)]

Any other objections, then?

review: Needs Resubmitting

[Alexander Wolf (alexwolf)]

It's OK for me

review: Approve

=== modified file 'src/CLIProcessor.cpp'
--- src/CLIProcessor.cpp	2014-06-12 13:47:38 +0000
+++ src/CLIProcessor.cpp	2014-09-12 11:42:18 +0000
@@ -54,7 +54,8 @@
 		          << "--config-file (or -c)   : Use an alternative name for the config file\n"
 		          << "--user-dir (or -u)      : Use an alternative user data directory\n"
 			  //<< "--safe-mode (or -s)     : Disable GL shaders and use older GL engine\n"
-			  //<< "                          Try this is you have graphics problems\n"
+			  << "--dump-opengl-details (or -d) : dump information about OpenGL support to logfile\n"
+			  << "                          Try this is you have graphics problems\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"
@@ -120,6 +121,8 @@
 	QString projectionType, screenshotDir, multiresImage, startupScript;
 	try
 	{
+		bool dumpOpenGLDetails = argsGetOption(argList, "-d", "--dump-opengl-details");
+		qApp->setProperty("dump_OpenGL_details", dumpOpenGLDetails);
 		fullScreen = argsGetYesNoOption(argList, "-f", "--full-screen", -1);
 		landscapeId = argsGetOptionWithArg(argList, "", "--landscape", "").toString();
 		homePlanet = argsGetOptionWithArg(argList, "", "--home-planet", "").toString();
 
=== modified file 'src/StelMainView.cpp'
--- src/StelMainView.cpp	2014-08-25 06:42:05 +0000
+++ src/StelMainView.cpp	2014-09-12 11:42:18 +0000
@@ -48,6 +48,8 @@
 #include <QWindow>
 #include <QDeclarativeContext>
 #include <QPinchGesture>
+#include <QOpenGLShader>
+#include <QOpenGLShaderProgram>
 
 #include <clocale>
 
@@ -71,7 +73,7 @@
 private:
 	double previousPaintTime;
 	void onSizeChanged();
-	void pinchTriggered(QPinchGesture *gesture);
+	void pinchTriggered(QPinchGesture *gesture);
 	bool gestureEvent(QGestureEvent *event);
 };
 
@@ -91,7 +93,7 @@
 	setObjectName("SkyItem");
 	setFlag(QGraphicsItem::ItemHasNoContents, false);
 	setAcceptHoverEvents(true);
-	setAcceptTouchEvents(true);
+	setAcceptTouchEvents(true);
 	grabGesture(Qt::PinchGesture);
 	setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton | Qt::MiddleButton);
 	connect(this, &StelSkyItem::widthChanged, this, &StelSkyItem::onSizeChanged);
@@ -165,51 +167,51 @@
 	StelApp::getInstance().handleWheel(&newEvent);
 }
 
-bool StelSkyItem::event(QEvent * e)
-{
-	switch (e->type()){
-	case QEvent::TouchBegin:
-	case QEvent::TouchUpdate:
-	case QEvent::TouchEnd:
-	{
-		QTouchEvent *touchEvent = static_cast<QTouchEvent *>(e);
-		QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints();
-
-		if (touchPoints.count() == 1)
-			setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton | Qt::MiddleButton);
-
-		return true;
-	}
-		break;
-
-	case QEvent::Gesture:
-		setAcceptedMouseButtons(0);
-		return gestureEvent(static_cast<QGestureEvent*>(e));
-		break;
-
-	default:
-		return false;
-	}
-}
-
-bool StelSkyItem::gestureEvent(QGestureEvent *event)
-{
-	if (QGesture *pinch = event->gesture(Qt::PinchGesture))
-		pinchTriggered(static_cast<QPinchGesture *>(pinch));
-
-	return true;
-}
-
-void StelSkyItem::pinchTriggered(QPinchGesture *gesture)
-{
-	QPinchGesture::ChangeFlags changeFlags = gesture->changeFlags();
-	if (changeFlags & QPinchGesture::ScaleFactorChanged) {
-		qreal zoom = gesture->scaleFactor();
-
-		if (zoom < 2 && zoom > 0.5){
-			StelApp::getInstance().handlePinch(zoom, true);
-		}
-	}
+bool StelSkyItem::event(QEvent * e)
+{
+	switch (e->type()){
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
+	{
+		QTouchEvent *touchEvent = static_cast<QTouchEvent *>(e);
+		QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints();
+
+		if (touchPoints.count() == 1)
+			setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton | Qt::MiddleButton);
+
+		return true;
+	}
+		break;
+
+	case QEvent::Gesture:
+		setAcceptedMouseButtons(0);
+		return gestureEvent(static_cast<QGestureEvent*>(e));
+		break;
+
+	default:
+		return false;
+	}
+}
+
+bool StelSkyItem::gestureEvent(QGestureEvent *event)
+{
+	if (QGesture *pinch = event->gesture(Qt::PinchGesture))
+		pinchTriggered(static_cast<QPinchGesture *>(pinch));
+
+	return true;
+}
+
+void StelSkyItem::pinchTriggered(QPinchGesture *gesture)
+{
+	QPinchGesture::ChangeFlags changeFlags = gesture->changeFlags();
+	if (changeFlags & QPinchGesture::ScaleFactorChanged) {
+		qreal zoom = gesture->scaleFactor();
+
+		if (zoom < 2 && zoom > 0.5){
+			StelApp::getInstance().handlePinch(zoom, true);
+		}
+	}
 }
 
 void StelSkyItem::keyPressEvent(QKeyEvent* event)
@@ -347,6 +349,10 @@
 	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)));
 	
+	// Only give extended info if called on command line, for diagnostic.
+	if (qApp->property("dump_OpenGL_details").toBool())
+		dumpOpenGLdiagnostics();
+
 	stelApp= new StelApp();
 	stelApp->setGui(gui);
 	stelApp->init(conf);
@@ -354,7 +360,6 @@
 	actionMgr->addAction("actionSave_Screenshot_Global", N_("Miscellaneous"), N_("Save screenshot"), this, "saveScreenShot()", "Ctrl+S");
 	actionMgr->addAction("actionSet_Full_Screen_Global", N_("Display Options"), N_("Full-screen mode"), this, "fullScreen", "F11");
 	
-
 	StelPainter::initGLShaders();
 
 	setResizeMode(QDeclarativeView::SizeRootObjectToView);
@@ -448,6 +453,72 @@
 	return ver.join(", ");
 }
 
+void StelMainView::dumpOpenGLdiagnostics() const
+{
+	// GZ: Debug info about OpenGL capabilities.
+	QOpenGLContext *context = QOpenGLContext::currentContext();
+	if (context)
+	{
+		context->functions()->initializeOpenGLFunctions();
+		qDebug() << "initializeOpenGLFunctions()...";
+	}
+	else
+		qDebug() << "No OpenGL context";
+
+	QOpenGLFunctions::OpenGLFeatures oglFeatures=context->functions()->openGLFeatures();
+	qDebug() << "OpenGL Features:";
+	qDebug() << " - glActiveTexture() function is" << (oglFeatures&QOpenGLFunctions::Multitexture ? "" : "NOT") << "available.";
+	qDebug() << " - Shader functions are" << (oglFeatures&QOpenGLFunctions::Shaders ? "" : "NOT ") << "available.";
+	qDebug() << " - Vertex and index buffer functions are" << (oglFeatures&QOpenGLFunctions::Buffers ? "" : "NOT") << "available.";
+	qDebug() << " - Framebuffer object functions are" << (oglFeatures&QOpenGLFunctions::Framebuffers ? "" : "NOT") << "available.";
+	qDebug() << " - glBlendColor() is" << (oglFeatures&QOpenGLFunctions::BlendColor ? "" : "NOT") << "available.";
+	qDebug() << " - glBlendEquation() is" << (oglFeatures&QOpenGLFunctions::BlendEquation ? "" : "NOT") << "available.";
+	qDebug() << " - glBlendEquationSeparate() is" << (oglFeatures&QOpenGLFunctions::BlendEquationSeparate ? "" : "NOT") << "available.";
+	qDebug() << " - glBlendFuncSeparate() is" << (oglFeatures&QOpenGLFunctions::BlendFuncSeparate ? "" : "NOT") << "available.";
+	qDebug() << " - Blend subtract mode is" << (oglFeatures&QOpenGLFunctions::BlendSubtract ? "" : "NOT") << "available.";
+	qDebug() << " - Compressed texture functions are" << (oglFeatures&QOpenGLFunctions::CompressedTextures ? "" : "NOT") << "available.";
+	qDebug() << " - glSampleCoverage() function is" << (oglFeatures&QOpenGLFunctions::Multisample ? "" : "NOT") << "available.";
+	qDebug() << " - Separate stencil functions are" << (oglFeatures&QOpenGLFunctions::StencilSeparate ? "" : "NOT") << "available.";
+	qDebug() << " - Non power of two textures are" << (oglFeatures&QOpenGLFunctions::NPOTTextures ? "" : "NOT") << "available.";
+	qDebug() << " - Non power of two textures can" << (oglFeatures&QOpenGLFunctions::NPOTTextureRepeat ? "" : "NOT") << "use GL_REPEAT as wrap parameter.";
+	qDebug() << " - The fixed function pipeline is" << (oglFeatures&QOpenGLFunctions::FixedFunctionPipeline ? "" : "NOT") << "available.";
+
+	qDebug() << "OpenGL shader capabilities and details:";
+	qDebug() << " - Vertex Shader:" << (QOpenGLShader::hasOpenGLShaders(QOpenGLShader::Vertex, context) ? "YES" : "NO");
+	qDebug() << " - Fragment Shader:" << (QOpenGLShader::hasOpenGLShaders(QOpenGLShader::Fragment, context) ? "YES" : "NO");
+	qDebug() << " - Geometry Shader:" << (QOpenGLShader::hasOpenGLShaders(QOpenGLShader::Geometry, context) ? "YES" : "NO");
+	qDebug() << " - TessellationControl Shader:" << (QOpenGLShader::hasOpenGLShaders(QOpenGLShader::TessellationControl, context) ? "YES" : "NO");
+	qDebug() << " - TessellationEvaluation Shader:" << (QOpenGLShader::hasOpenGLShaders(QOpenGLShader::TessellationEvaluation, context) ? "YES" : "NO");
+	qDebug() << " - Compute Shader:" << (QOpenGLShader::hasOpenGLShaders(QOpenGLShader::Compute, context) ? "YES" : "NO");
+
+	// GZ: List available extensions. Not sure if this is in any way useful?
+	QSet<QByteArray> extensionSet=context->extensions();
+	qDebug() << "We have" << extensionSet.count() << "OpenGL extensions:";
+	QMap<QString, QString> extensionMap;
+	QSetIterator<QByteArray> iter(extensionSet);
+	while (iter.hasNext())
+	{
+		extensionMap.insert(QString(iter.peekNext()), QString(iter.peekNext()));
+		iter.next();
+	}
+	QMapIterator<QString, QString> iter2(extensionMap);
+	while (iter2.hasNext())
+		qDebug() << " - " << iter2.next().key();
+
+	QFunctionPointer programParameterPtr =context->getProcAddress("glProgramParameteri");
+	if (programParameterPtr == 0)
+		qDebug() << "glProgramParameteri cannot be resolved here. BAD!";
+	//else
+	//	qDebug() << "glProgramParameteri can be resolved. GOOD!";
+	programParameterPtr =context->getProcAddress("glProgramParameteriEXT");
+	if (programParameterPtr == 0)
+		qDebug() << "glProgramParameteriEXT cannot be resolved here. BAD!";
+	//else
+	//	qDebug() << "glProgramParameteriEXT can be resolved here. GOOD!";
+
+}
+
+
 void StelMainView::deinit()
 {
 	deinitGL();
 
=== modified file 'src/StelMainView.hpp'
--- src/StelMainView.hpp	2014-06-09 01:02:28 +0000
+++ src/StelMainView.hpp	2014-09-12 11:42:18 +0000
@@ -25,6 +25,7 @@
 #include <QDeclarativeView>
 #include <QCoreApplication>
 #include <QEventLoop>
+#include <QOpenGLContext>
 
 class QDeclarativeItem;
 class QGLWidget;
@@ -147,6 +148,8 @@
 	void startMainLoop();
 	
 	QString getSupportedOpenGLVersion() const;
+	//! provide extensive OpenGL dignostics in logfile.
+	void dumpOpenGLdiagnostics() const;
 
 	//! The StelMainView singleton
 	static StelMainView* singleton;
 
=== modified file 'src/core/StelOpenGL.hpp'
--- src/core/StelOpenGL.hpp	2014-07-02 16:31:14 +0000
+++ src/core/StelOpenGL.hpp	2014-09-12 11:42:18 +0000
@@ -98,6 +98,8 @@
 #define glIsRenderbuffer(...)       GLFUNC_(glIsRenderbuffer(__VA_ARGS__))
 #define glIsShader(...)             GLFUNC_(glIsShader(__VA_ARGS__))
 #define glLinkProgram(...)          GLFUNC_(glLinkProgram(__VA_ARGS__))
+#define glProgramParameteri(...)    GLFUNC_(glProgramParameteri(__VA_ARGS__)) // GZ TRIAL
+#define glProgramParameteriEXT(...)    GLFUNC_(glProgramParameteriEXT(__VA_ARGS__)) // GZ TRIAL
 #define glReleaseShaderCompiler(...)    GLFUNC_(glReleaseShaderCompiler(__VA_ARGS__))
 #define glRenderbufferStorage(...)  GLFUNC_(glRenderbufferStorage(__VA_ARGS__))
 #define glSampleCoverage(...)       GLFUNC_(glSampleCoverage(__VA_ARGS__))