Disable OpenGLFunctions::requestMinimumFormat on Windows

timangus · timangus · commit d201c1cfbf3f · 2023-12-08T18:09:47.000Z
diff --git a/source/app/rendering/openglfunctions.cpp b/source/app/rendering/openglfunctions.cpp
@@ -59,13 +59,15 @@ QSurfaceFormat OpenGLFunctions::minimumFormat()
 
 void OpenGLFunctions::requestMinimumFormat()
 {
+#ifndef Q_OS_WIN // For reasons not understood, this causes problems on Windows
     const auto defaultFormat = QSurfaceFormat::defaultFormat();
     const std::pair<int, int> defaultVersion = {defaultFormat.majorVersion(), defaultFormat.minorVersion()};
     const auto requestFormat = minimumFormat();
     const std::pair<int, int> requestVersion = {requestFormat.majorVersion(), requestFormat.minorVersion()};
 
     if(defaultVersion < requestVersion)
         QSurfaceFormat::setDefaultFormat(requestFormat);
+#endif
 }
 
 class QueryFunctions

Original file line number	Diff line number	Diff line change
`@@ -59,13 +59,15 @@ QSurfaceFormat OpenGLFunctions::minimumFormat()`
`59`	`59`
`60`	`60`	`void OpenGLFunctions::requestMinimumFormat()`
`61`	`61`	`{`
	`62`	`+#ifndef Q_OS_WIN // For reasons not understood, this causes problems on Windows`
`62`	`63`	`const auto defaultFormat = QSurfaceFormat::defaultFormat();`
`63`	`64`	`const std::pair<int, int> defaultVersion = {defaultFormat.majorVersion(), defaultFormat.minorVersion()};`
`64`	`65`	`const auto requestFormat = minimumFormat();`
`65`	`66`	`const std::pair<int, int> requestVersion = {requestFormat.majorVersion(), requestFormat.minorVersion()};`
`66`	`67`
`67`	`68`	`if(defaultVersion < requestVersion)`
`68`	`69`	`QSurfaceFormat::setDefaultFormat(requestFormat);`
	`70`	`+#endif`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`class QueryFunctions`