disable FBO for QOpenGLWidget (Qt6.x)

pbartfai · pbartfai · commit ebe9da1411c8 · 2025-06-27T11:56:31.000+02:00
diff --git a/QT/ModelViewerWidget.cpp b/QT/ModelViewerWidget.cpp
@@ -2391,6 +2391,7 @@ bool ModelViewerWidget::grabImage(
 	bool fromCommandLine /*= false*/)
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#ifndef QOPENGLWIDGET
 	if (fbo == NULL && (TCUserDefaults::longForKey(IGNORE_FRAMEBUFFER_OBJECT_KEY, 0, false)==0))
 	{
 		QOpenGLFramebufferObjectFormat fboFormat;
@@ -2421,6 +2422,7 @@ bool ModelViewerWidget::grabImage(
 			saving = false;
 		}
 	}
+#endif
 #endif
 	if (!fromCommandLine)
 	{
@@ -2520,10 +2522,14 @@ TCByte *ModelViewerWidget::grabImage(
 	{
 		snapshotTaker = new LDSnapshotTaker(modelViewer);
 	}
+#ifndef QOPENGLWIDGET
 	if (TREGLExtensions::haveFramebufferObjectExtension())
 	{
 		snapshotTaker->setUseFBO(true);
 	}
+#else
+	snapshotTaker->setUseFBO(false);
+#endif
 	snapshotTaker->setImageType(getSaveImageType());
 	snapshotTaker->setTrySaveAlpha(saveAlpha =
 		TCUserDefaults::longForKey(SAVE_ALPHA_KEY, 0, false) != 0);
@@ -2848,10 +2854,14 @@ bool ModelViewerWidget::saveImage(
 			snapshotTaker = new LDSnapshotTaker(modelViewer);
 		}
 	}
+#ifndef QOPENGLWIDGET
 	if (TREGLExtensions::haveFramebufferObjectExtension())
 	{
 		snapshotTaker->setUseFBO(true);
 	}
+#else
+	snapshotTaker->setUseFBO(false);
+#endif
 	snapshotTaker->setImageType(getSaveImageType());
 	snapshotTaker->setTrySaveAlpha(saveAlpha =
 		TCUserDefaults::longForKey(SAVE_ALPHA_KEY, 0, false) != 0);
diff --git a/QT/SnapshotTaker.cpp b/QT/SnapshotTaker.cpp
@@ -189,7 +189,11 @@ void SnapshotTaker::snapshotCallback(TCAlert *alert)
 		}
 		TREGLExtensions::setup();
 		ldSnapshotTaker = (LDSnapshotTaker*)alert->getSender()->retain();
+#ifndef QOPENGLWIDGET
 		ldSnapshotTaker->setUseFBO(true);
+#else
+		ldSnapshotTaker->setUseFBO(false);
+#endif
 #endif
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2391,6 +2391,7 @@ bool ModelViewerWidget::grabImage(`
`2391`	`2391`	`bool fromCommandLine /= false/)`
`2392`	`2392`	`{`
`2393`	`2393`	`#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)`
	`2394`	`+#ifndef QOPENGLWIDGET`
`2394`	`2395`	`if (fbo == NULL && (TCUserDefaults::longForKey(IGNORE_FRAMEBUFFER_OBJECT_KEY, 0, false)==0))`
`2395`	`2396`	`{`
`2396`	`2397`	`QOpenGLFramebufferObjectFormat fboFormat;`
`@@ -2421,6 +2422,7 @@ bool ModelViewerWidget::grabImage(`
`2421`	`2422`	`saving = false;`
`2422`	`2423`	`}`
`2423`	`2424`	`}`
	`2425`	`+#endif`
`2424`	`2426`	`#endif`
`2425`	`2427`	`if (!fromCommandLine)`
`2426`	`2428`	`{`
`@@ -2520,10 +2522,14 @@ TCByte *ModelViewerWidget::grabImage(`
`2520`	`2522`	`{`
`2521`	`2523`	`snapshotTaker = new LDSnapshotTaker(modelViewer);`
`2522`	`2524`	`}`
	`2525`	`+#ifndef QOPENGLWIDGET`
`2523`	`2526`	`if (TREGLExtensions::haveFramebufferObjectExtension())`
`2524`	`2527`	`{`
`2525`	`2528`	`snapshotTaker->setUseFBO(true);`
`2526`	`2529`	`}`
	`2530`	`+#else`
	`2531`	`+ snapshotTaker->setUseFBO(false);`
	`2532`	`+#endif`
`2527`	`2533`	`snapshotTaker->setImageType(getSaveImageType());`
`2528`	`2534`	`snapshotTaker->setTrySaveAlpha(saveAlpha =`
`2529`	`2535`	`TCUserDefaults::longForKey(SAVE_ALPHA_KEY, 0, false) != 0);`
`@@ -2848,10 +2854,14 @@ bool ModelViewerWidget::saveImage(`
`2848`	`2854`	`snapshotTaker = new LDSnapshotTaker(modelViewer);`
`2849`	`2855`	`}`
`2850`	`2856`	`}`
	`2857`	`+#ifndef QOPENGLWIDGET`
`2851`	`2858`	`if (TREGLExtensions::haveFramebufferObjectExtension())`
`2852`	`2859`	`{`
`2853`	`2860`	`snapshotTaker->setUseFBO(true);`
`2854`	`2861`	`}`
	`2862`	`+#else`
	`2863`	`+ snapshotTaker->setUseFBO(false);`
	`2864`	`+#endif`
`2855`	`2865`	`snapshotTaker->setImageType(getSaveImageType());`
`2856`	`2866`	`snapshotTaker->setTrySaveAlpha(saveAlpha =`
`2857`	`2867`	`TCUserDefaults::longForKey(SAVE_ALPHA_KEY, 0, false) != 0);`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,11 @@ void SnapshotTaker::snapshotCallback(TCAlert *alert)`
`189`	`189`	`}`
`190`	`190`	`TREGLExtensions::setup();`
`191`	`191`	`ldSnapshotTaker = (LDSnapshotTaker*)alert->getSender()->retain();`
	`192`	`+#ifndef QOPENGLWIDGET`
`192`	`193`	`ldSnapshotTaker->setUseFBO(true);`
	`194`	`+#else`
	`195`	`+ ldSnapshotTaker->setUseFBO(false);`
	`196`	`+#endif`
`193`	`197`	`#endif`
`194`	`198`	`}`
`195`	`199`	`}`