Port {Circular,}Spinner fragmentShader to Qt6 (qsb)

Author: JamiKettunen

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6.0)
+cmake_minimum_required(VERSION 3.7.0)
 
 project(qml-asteroid
 	VERSION 2.0.0

src/controls/CMakeLists.txt

@@ -44,6 +44,20 @@ qt_add_resources(asteroidcontrolsplugin "asteroidcontrolsplugin_qrc"
         "qml/TextField.qml"
 )
 
+if (QT_MAJOR_VERSION GREATER_EQUAL 6)
+    find_package(Qt6 COMPONENTS ShaderTools)
+    qt6_add_shaders(asteroidcontrolsplugin "asteroidcontrolsplugin_shaders"
+        #GLSL "300es,330" # FIXME: drop?
+        BATCHABLE
+        PRECOMPILE
+        OPTIMIZED
+        PREFIX
+            "/org/asteroid/controls/"
+        FILES
+            "qml/Spinner.frag"
+    )
+endif()
+
 set(controls 
         Application
         BorderGestureArea

src/controls/qml/CircularSpinner.qml

@@ -93,19 +93,6 @@ PathView {
 
     layer.enabled: true
     layer.effect: ShaderEffect {
-        fragmentShader: "
-        precision mediump float;
-        varying highp vec2 qt_TexCoord0;
-        uniform sampler2D source;
-        void main(void)
-        {
-            vec4 sourceColor = texture2D(source, qt_TexCoord0);
-            float alpha = 1.0;
-            if(qt_TexCoord0.y < 0.2)
-                alpha = qt_TexCoord0.y*5.0;
-            if(qt_TexCoord0.y > 0.8)
-                alpha = (1.0-qt_TexCoord0.y)*5.0;
-            gl_FragColor = sourceColor * alpha;
-        }"
+        fragmentShader: "Spinner.frag.qsb"
     }
 }

src/controls/qml/Spinner.frag

@@ -0,0 +1,14 @@
+#version 440
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+layout(binding = 1) uniform sampler2D source;
+void main(void)
+{
+    vec4 sourceColor = texture(source, qt_TexCoord0);
+    float alpha = 1.0;
+    if(qt_TexCoord0.y < 0.2)
+        alpha = qt_TexCoord0.y*5.0;
+    if(qt_TexCoord0.y > 0.8)
+        alpha = (1.0-qt_TexCoord0.y)*5.0;
+    fragColor = sourceColor * alpha;
+}

src/controls/qml/Spinner.qml

@@ -72,19 +72,6 @@ ListView {
 
     layer.enabled: true
     layer.effect: ShaderEffect {
-        fragmentShader: "
-        precision mediump float;
-        varying highp vec2 qt_TexCoord0;
-        uniform sampler2D source;
-        void main(void)
-        {
-            vec4 sourceColor = texture2D(source, qt_TexCoord0);
-            float alpha = 1.0;
-            if(qt_TexCoord0.y < 0.2)
-                alpha = qt_TexCoord0.y*5.0;
-            if(qt_TexCoord0.y > 0.8)
-                alpha = (1.0-qt_TexCoord0.y)*5.0;
-            gl_FragColor = sourceColor * alpha;
-        }"
+        fragmentShader: "Spinner.frag.qsb"
     }
 }