From aa542150122d975a1a6fc097a0ce4e2dd339528e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Wed, 19 Feb 2014 14:01:09 +0200
Subject: MSAA support added to QML
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I64258705e4423b2762aeff28c3eafd6bdf5d34e9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 .../qmlsurfacelayers/qml/qmlsurfacelayers/main.qml | 36 +++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

(limited to 'examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers')

diff --git a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
index 8b802060..bd68ff69 100644
--- a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
+++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
@@ -232,26 +232,40 @@ Item {
         }
 
         NewButton {
-            id: aaButton
-            text: "Disable Antialiasing"
+            id: renderModeButton
+            text: "Switch Render Mode"
             Layout.fillWidth: true
             Layout.minimumHeight: 40
-            visible: false
             onClicked: {
-                if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect_NoAA) {
+                if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
+                        surfaceLayers.msaaSamples === 0) {
                     surfaceLayers.renderingMode = AbstractGraph3D.RenderDirectToBackground
-                    text = "Disable Antialiasing"
+                    renderLabel.text = "Background, " + surfaceLayers.msaaSamples + "xMSAA"
+                } else if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
+                           surfaceLayers.msaaSamples === 4) {
+                    surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
+                    surfaceLayers.msaaSamples = 0
+                    renderLabel.text = "Indirect, No AA"
+                } else if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
+                           surfaceLayers.msaaSamples === 8) {
+                    surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
+                    surfaceLayers.msaaSamples = 4
+                    renderLabel.text = "Indirect, 4xMSAA"
                 } else {
-                    surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect_NoAA
-                    text = "Enable Antialiasing"
+                    surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
+                    surfaceLayers.msaaSamples = 8
+                    renderLabel.text = "Indirect, 8xMSAA"
                 }
             }
         }
 
-        Component.onCompleted: {
-            if (surfaceLayers.antialiasing) {
-                aaButton.visible = true
-            }
+        TextField {
+            id: renderLabel
+            Layout.fillWidth: true
+            Layout.minimumHeight: 40
+            enabled: false
+            horizontalAlignment: TextInput.AlignHCenter
+            text: "Indirect, 4xMSAA"
         }
     }
 }
-- 
cgit v1.2.3