Implement public utility function for AA setup

qDefaultSurfaceFormat() can be used to set up antialiasing for QML
apps in just two lines:

...
viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());

Task-number: QTRD-2734
Change-Id: I3f7ba728cef6310d794256e1dc4c28cc33b2f9a3
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index 3aada9cf..01974e54 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -21,6 +21,7 @@
 #include "abstract3dcontroller_p.h"
 #include "qabstract3dinputhandler_p.h"
 #include "q3dscene_p.h"
+#include "qutils.h"
 
 #include <QGuiApplication>
 #include <QOpenGLContext>
@@ -65,19 +66,15 @@ QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFor
     QSurfaceFormat surfaceFormat;
     if (format) {
         surfaceFormat = *format;
-    } else {
-        surfaceFormat.setDepthBufferSize(24);
+        // Make sure renderable type is correct
 #if !defined(QT_OPENGL_ES_2)
-        surfaceFormat.setSamples(8);
-#endif
-        surfaceFormat.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
-    }
-
-#if !defined(QT_OPENGL_ES_2)
-    surfaceFormat.setRenderableType(QSurfaceFormat::OpenGL);
+        surfaceFormat.setRenderableType(QSurfaceFormat::OpenGL);
 #else
-    surfaceFormat.setRenderableType(QSurfaceFormat::OpenGLES);
+        surfaceFormat.setRenderableType(QSurfaceFormat::OpenGLES);
 #endif
+    } else {
+        surfaceFormat = qDefaultSurfaceFormat();
+    }
 
     d_ptr->m_context = new QOpenGLContext(this);
     setSurfaceType(QWindow::OpenGLSurface);