From 936e63760560458910cc0178a35a9dd0c56db66e Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Wed, 1 Dec 2010 01:48:39 +0100 Subject: [PATCH] option to use software fallback by default (part 2) --- src/qtgui/glwidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qtgui/glwidget.cpp b/src/qtgui/glwidget.cpp index 3992b32e..1e71276f 100644 --- a/src/qtgui/glwidget.cpp +++ b/src/qtgui/glwidget.cpp @@ -116,6 +116,9 @@ void GLWidget::initializeGL() { missingExtensions.push_back("Vertex buffer objects"); if (missingExtensions.size() > 0 || m_softwareFallback) { +#if !defined(MTS_GUI_SOFTWARE_FALLBACK) + /* Show a warning message unless the fallback mode + was explicitly requested */ std::ostringstream oss; oss << "You machine is missing the following required " "OpenGL capabilities: "; @@ -130,9 +133,10 @@ void GLWidget::initializeGL() { << "the rendering preview but no tonemapping and no " << "real-time preview/navigation."; m_errorString = QString(oss.str().c_str()); + m_softwareFallback = true; +#endif // Don't redraw as often, since this is now quite costly m_redrawTimer->setInterval(1000); - m_softwareFallback = true; } else { m_gammaTonemap = m_renderer->createGPUProgram("Tonemapper [Gamma]"); m_reinhardTonemap = m_renderer->createGPUProgram("Tonemapper [Reinhard et al. 2002]");