Bake shaders at build time

Change-Id: Ia6879ca75750ceb54f145dab9d25ac1ed78289a2
Reviewed-by: Shawn Rutledge <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>

59 files changed, 62 insertions, 225 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd17f4a3c1..6342f42322 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
 # special case end
 
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test) # special case
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test ShaderTools) # special case
 
 # special case begin
 # export QT6_ADD_QML_MODULE to this project
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 135f116450..f8c35a7eb5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,7 @@ if (QT_FEATURE_qml_xmllistmodel)
     add_subdirectory(qmlxmllistmodel)
 endif()
 
-if(TARGET Qt::Gui AND QT_FEATURE_qml_animation)
+if(TARGET Qt::Gui AND TARGET Qt::ShaderTools AND QT_FEATURE_qml_animation)
     add_subdirectory(quick)
     add_subdirectory(quickshapes)
     add_subdirectory(quicklayouts)
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 4583a29433..6ca9b1ee61 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -219,73 +219,69 @@ qt_internal_add_module(Quick
         Qt::QmlPrivate
 )
 
-# Resources:
-set(scenegraph_resource_files
-    "shaders_ng/24bittextmask.frag.qsb"
-    "shaders_ng/32bitcolortext.frag.qsb"
-    "shaders_ng/8bittextmask.frag.qsb"
-    "shaders_ng/8bittextmask_a.frag.qsb"
-    "shaders_ng/distancefieldoutlinetext.frag.qsb"
-    "shaders_ng/distancefieldoutlinetext.vert.qsb"
-    "shaders_ng/distancefieldoutlinetext_a.frag.qsb"
-    "shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb"
-    "shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb"
-    "shaders_ng/distancefieldshiftedtext.frag.qsb"
-    "shaders_ng/distancefieldshiftedtext.vert.qsb"
-    "shaders_ng/distancefieldshiftedtext_a.frag.qsb"
-    "shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb"
-    "shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb"
-    "shaders_ng/distancefieldtext.frag.qsb"
-    "shaders_ng/distancefieldtext.vert.qsb"
-    "shaders_ng/distancefieldtext_a.frag.qsb"
-    "shaders_ng/distancefieldtext_a_fwidth.frag.qsb"
-    "shaders_ng/distancefieldtext_fwidth.frag.qsb"
-    "shaders_ng/flatcolor.frag.qsb"
-    "shaders_ng/flatcolor.vert.qsb"
-    "shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb"
-    "shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb"
-    "shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb"
-    "shaders_ng/loqsubpixeldistancefieldtext.frag.qsb"
-    "shaders_ng/loqsubpixeldistancefieldtext.vert.qsb"
-    "shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb"
-    "shaders_ng/opaquetexture.frag.qsb"
-    "shaders_ng/opaquetexture.vert.qsb"
-    "shaders_ng/outlinedtext.frag.qsb"
-    "shaders_ng/outlinedtext.vert.qsb"
-    "shaders_ng/outlinedtext_a.frag.qsb"
-    "shaders_ng/shadereffect.frag.qsb"
-    "shaders_ng/shadereffect.vert.qsb"
-    "shaders_ng/smoothcolor.frag.qsb"
-    "shaders_ng/smoothcolor.vert.qsb"
-    "shaders_ng/smoothtexture.frag.qsb"
-    "shaders_ng/smoothtexture.vert.qsb"
-    "shaders_ng/sprite.frag.qsb"
-    "shaders_ng/sprite.vert.qsb"
-    "shaders_ng/stencilclip.frag.qsb"
-    "shaders_ng/stencilclip.vert.qsb"
-    "shaders_ng/styledtext.frag.qsb"
-    "shaders_ng/styledtext.vert.qsb"
-    "shaders_ng/styledtext_a.frag.qsb"
-    "shaders_ng/textmask.frag.qsb"
-    "shaders_ng/textmask.vert.qsb"
-    "shaders_ng/texture.frag.qsb"
-    "shaders_ng/texture.vert.qsb"
-    "shaders_ng/vertexcolor.frag.qsb"
-    "shaders_ng/vertexcolor.vert.qsb"
-    "shaders_ng/visualization.frag.qsb"
-    "shaders_ng/visualization.vert.qsb"
-)
-
-qt_internal_add_resource(Quick "scenegraph"
+qt_internal_add_shaders(Quick "scenegraph_shaders"
+    SILENT
+    BATCHABLE
+    PRECOMPILE
+    OPTIMIZED
     PREFIX
-        "/qt-project.org/scenegraph"
-    BASE
-        "scenegraph"
+        "/qt-project.org/scenegraph/shaders_ng"
     FILES
-        ${scenegraph_resource_files}
+        "scenegraph/shaders_ng/24bittextmask.frag"
+        "scenegraph/shaders_ng/32bitcolortext.frag"
+        "scenegraph/shaders_ng/8bittextmask.frag"
+        "scenegraph/shaders_ng/8bittextmask_a.frag"
+        "scenegraph/shaders_ng/distancefieldoutlinetext.frag"
+        "scenegraph/shaders_ng/distancefieldoutlinetext.vert"
+        "scenegraph/shaders_ng/distancefieldoutlinetext_a.frag"
+        "scenegraph/shaders_ng/distancefieldoutlinetext_a_fwidth.frag"
+        "scenegraph/shaders_ng/distancefieldoutlinetext_fwidth.frag"
+        "scenegraph/shaders_ng/distancefieldshiftedtext.frag"
+        "scenegraph/shaders_ng/distancefieldshiftedtext.vert"
+        "scenegraph/shaders_ng/distancefieldshiftedtext_a.frag"
+        "scenegraph/shaders_ng/distancefieldshiftedtext_a_fwidth.frag"
+        "scenegraph/shaders_ng/distancefieldshiftedtext_fwidth.frag"
+        "scenegraph/shaders_ng/distancefieldtext.frag"
+        "scenegraph/shaders_ng/distancefieldtext.vert"
+        "scenegraph/shaders_ng/distancefieldtext_a.frag"
+        "scenegraph/shaders_ng/distancefieldtext_a_fwidth.frag"
+        "scenegraph/shaders_ng/distancefieldtext_fwidth.frag"
+        "scenegraph/shaders_ng/flatcolor.frag"
+        "scenegraph/shaders_ng/flatcolor.vert"
+        "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.frag"
+        "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.vert"
+        "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext_a.frag"
+        "scenegraph/shaders_ng/loqsubpixeldistancefieldtext.frag"
+        "scenegraph/shaders_ng/loqsubpixeldistancefieldtext.vert"
+        "scenegraph/shaders_ng/loqsubpixeldistancefieldtext_a.frag"
+        "scenegraph/shaders_ng/opaquetexture.frag"
+        "scenegraph/shaders_ng/opaquetexture.vert"
+        "scenegraph/shaders_ng/outlinedtext.frag"
+        "scenegraph/shaders_ng/outlinedtext.vert"
+        "scenegraph/shaders_ng/outlinedtext_a.frag"
+        "scenegraph/shaders_ng/shadereffect.frag"
+        "scenegraph/shaders_ng/shadereffect.vert"
+        "scenegraph/shaders_ng/smoothcolor.frag"
+        "scenegraph/shaders_ng/smoothcolor.vert"
+        "scenegraph/shaders_ng/smoothtexture.frag"
+        "scenegraph/shaders_ng/smoothtexture.vert"
+        "scenegraph/shaders_ng/sprite.frag"
+        "scenegraph/shaders_ng/sprite.vert"
+        "scenegraph/shaders_ng/stencilclip.frag"
+        "scenegraph/shaders_ng/stencilclip.vert"
+        "scenegraph/shaders_ng/styledtext.frag"
+        "scenegraph/shaders_ng/styledtext.vert"
+        "scenegraph/shaders_ng/styledtext_a.frag"
+        "scenegraph/shaders_ng/textmask.frag"
+        "scenegraph/shaders_ng/textmask.vert"
+        "scenegraph/shaders_ng/texture.frag"
+        "scenegraph/shaders_ng/texture.vert"
+        "scenegraph/shaders_ng/vertexcolor.frag"
+        "scenegraph/shaders_ng/vertexcolor.vert"
+        "scenegraph/shaders_ng/visualization.frag"
+        "scenegraph/shaders_ng/visualization.vert"
 )
 
-
 if(ANDROID)
     set_property(TARGET Quick APPEND PROPERTY QT_ANDROID_BUNDLED_FILES
         qml
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp
index 2df9c50898..17c7f0b34d 100644
--- a/src/quick/scenegraph/qsgdefaultcontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultcontext.cpp
@@ -327,7 +327,7 @@ QT_END_NAMESPACE
 
 static void initResources()
 {
-    Q_INIT_RESOURCE(scenegraph);
+    Q_INIT_RESOURCE(scenegraph_shaders);
 }
 
 Q_CONSTRUCTOR_FUNCTION(initResources)
diff --git a/src/quick/scenegraph/scenegraph.qrc b/src/quick/scenegraph/scenegraph.qrc
deleted file mode 100644
index d9f0742850..0000000000
--- a/src/quick/scenegraph/scenegraph.qrc
+++ /dev/null
@@ -1,61 +0,0 @@
-<RCC>
-    <qresource prefix="/qt-project.org/scenegraph">
-        <file>shaders_ng/vertexcolor.vert.qsb</file>
-        <file>shaders_ng/vertexcolor.frag.qsb</file>
-        <file>shaders_ng/flatcolor.vert.qsb</file>
-        <file>shaders_ng/flatcolor.frag.qsb</file>
-        <file>shaders_ng/smoothcolor.vert.qsb</file>
-        <file>shaders_ng/smoothcolor.frag.qsb</file>
-        <file>shaders_ng/stencilclip.vert.qsb</file>
-        <file>shaders_ng/stencilclip.frag.qsb</file>
-        <file>shaders_ng/texture.vert.qsb</file>
-        <file>shaders_ng/texture.frag.qsb</file>
-        <file>shaders_ng/opaquetexture.vert.qsb</file>
-        <file>shaders_ng/opaquetexture.frag.qsb</file>
-        <file>shaders_ng/smoothtexture.vert.qsb</file>
-        <file>shaders_ng/smoothtexture.frag.qsb</file>
-
-        <file>shaders_ng/textmask.vert.qsb</file>
-        <file>shaders_ng/textmask.frag.qsb</file>
-        <file>shaders_ng/8bittextmask.frag.qsb</file>
-        <file>shaders_ng/8bittextmask_a.frag.qsb</file>
-        <file>shaders_ng/24bittextmask.frag.qsb</file>
-        <file>shaders_ng/32bitcolortext.frag.qsb</file>
-        <file>shaders_ng/outlinedtext.vert.qsb</file>
-        <file>shaders_ng/outlinedtext.frag.qsb</file>
-        <file>shaders_ng/outlinedtext_a.frag.qsb</file>
-        <file>shaders_ng/styledtext.vert.qsb</file>
-        <file>shaders_ng/styledtext.frag.qsb</file>
-        <file>shaders_ng/styledtext_a.frag.qsb</file>
-
-        <file>shaders_ng/distancefieldtext.vert.qsb</file>
-        <file>shaders_ng/distancefieldtext.frag.qsb</file>
-        <file>shaders_ng/distancefieldtext_fwidth.frag.qsb</file>
-        <file>shaders_ng/distancefieldtext_a.frag.qsb</file>
-        <file>shaders_ng/distancefieldtext_a_fwidth.frag.qsb</file>
-        <file>shaders_ng/distancefieldshiftedtext.vert.qsb</file>
-        <file>shaders_ng/distancefieldshiftedtext.frag.qsb</file>
-        <file>shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb</file>
-        <file>shaders_ng/distancefieldshiftedtext_a.frag.qsb</file>
-        <file>shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb</file>
-        <file>shaders_ng/distancefieldoutlinetext.vert.qsb</file>
-        <file>shaders_ng/distancefieldoutlinetext.frag.qsb</file>
-        <file>shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb</file>
-        <file>shaders_ng/distancefieldoutlinetext_a.frag.qsb</file>
-        <file>shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb</file>
-        <file>shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb</file>
-        <file>shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb</file>
-        <file>shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb</file>
-        <file>shaders_ng/loqsubpixeldistancefieldtext.vert.qsb</file>
-        <file>shaders_ng/loqsubpixeldistancefieldtext.frag.qsb</file>
-        <file>shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb</file>
-
-        <file>shaders_ng/shadereffect.vert.qsb</file>
-        <file>shaders_ng/shadereffect.frag.qsb</file>
-        <file>shaders_ng/sprite.vert.qsb</file>
-        <file>shaders_ng/sprite.frag.qsb</file>
-
-        <file>shaders_ng/visualization.vert.qsb</file>
-        <file>shaders_ng/visualization.frag.qsb</file>
-    </qresource>
-</RCC>
diff --git a/src/quick/scenegraph/shaders_ng/24bittextmask.frag.qsb b/src/quick/scenegraph/shaders_ng/24bittextmask.frag.qsb
deleted file mode 100644
index 1850d061f9..0000000000
--- a/src/quick/scenegraph/shaders_ng/24bittextmask.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/32bitcolortext.frag.qsb b/src/quick/scenegraph/shaders_ng/32bitcolortext.frag.qsb
deleted file mode 100644
index 99ba159189..0000000000
--- a/src/quick/scenegraph/shaders_ng/32bitcolortext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/8bittextmask.frag.qsb b/src/quick/scenegraph/shaders_ng/8bittextmask.frag.qsb
deleted file mode 100644
index ed45c364ca..0000000000
--- a/src/quick/scenegraph/shaders_ng/8bittextmask.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag.qsb b/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag.qsb
deleted file mode 100644
index 427a6dfaf8..0000000000
--- a/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/compile.bat b/src/quick/scenegraph/shaders_ng/compile.bat
deleted file mode 100755
index bd73016be5..0000000000
--- a/src/quick/scenegraph/shaders_ng/compile.bat
+++ /dev/null
@@ -1,98 +0,0 @@
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::
-:: Copyright (C) 2019 The Qt Company Ltd.
-:: Contact: https://www.qt.io/licensing/
-::
-:: This file is part of the QtQuick module of the Qt Toolkit.
-::
-:: $QT_BEGIN_LICENSE:LGPL$
-:: Commercial License Usage
-:: Licensees holding valid commercial Qt licenses may use this file in
-:: accordance with the commercial license agreement provided with the
-:: Software or, alternatively, in accordance with the terms contained in
-:: a written agreement between you and The Qt Company. For licensing terms
-:: and conditions see https://www.qt.io/terms-conditions. For further
-:: information use the contact form at https://www.qt.io/contact-us.
-::
-:: GNU Lesser General Public License Usage
-:: Alternatively, this file may be used under the terms of the GNU Lesser
-:: General Public License version 3 as published by the Free Software
-:: Foundation and appearing in the file LICENSE.LGPL3 included in the
-:: packaging of this file. Please review the following information to
-:: ensure the GNU Lesser General Public License version 3 requirements
-:: will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-::
-:: GNU General Public License Usage
-:: Alternatively, this file may be used under the terms of the GNU
-:: General Public License version 2.0 or (at your option) the GNU General
-:: Public license version 3 or any later version approved by the KDE Free
-:: Qt Foundation. The licenses are as published by the Free Software
-:: Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-:: included in the packaging of this file. Please review the following
-:: information to ensure the GNU General Public License requirements will
-:: be met: https://www.gnu.org/licenses/gpl-2.0.html and
-:: https://www.gnu.org/licenses/gpl-3.0.html.
-::
-:: $QT_END_LICENSE$
-::
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-:: For HLSL we invoke fxc.exe (-c argument) and store the resulting intermediate format
-:: instead of HLSL source, so this needs to be run on Windows from a developer command prompt.
-
-:: For SPIR-V the optimizer is requested (-O argument) which means spirv-opt must be
-:: invokable (e.g. because it's in the PATH from the Vulkan SDK)
-
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o vertexcolor.vert.qsb vertexcolor.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o vertexcolor.frag.qsb vertexcolor.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o flatcolor.vert.qsb flatcolor.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o flatcolor.frag.qsb flatcolor.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o smoothcolor.vert.qsb smoothcolor.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o smoothcolor.frag.qsb smoothcolor.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o stencilclip.vert.qsb stencilclip.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o stencilclip.frag.qsb stencilclip.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o texture.vert.qsb texture.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o texture.frag.qsb texture.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o opaquetexture.vert.qsb opaquetexture.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o opaquetexture.frag.qsb opaquetexture.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o smoothtexture.vert.qsb smoothtexture.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o smoothtexture.frag.qsb smoothtexture.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o textmask.vert.qsb textmask.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o textmask.frag.qsb textmask.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o 8bittextmask.frag.qsb 8bittextmask.frag
-qsb --glsl "150,120,100 es" -o 8bittextmask_a.frag.qsb 8bittextmask_a.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o 24bittextmask.frag.qsb 24bittextmask.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o 32bitcolortext.frag.qsb 32bitcolortext.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o outlinedtext.vert.qsb outlinedtext.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o outlinedtext.frag.qsb outlinedtext.frag
-qsb --glsl "150,120,100 es" -o outlinedtext_a.frag.qsb outlinedtext_a.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o styledtext.vert.qsb styledtext.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o styledtext.frag.qsb styledtext.frag
-qsb --glsl "150,120,100 es" -o styledtext_a.frag.qsb styledtext_a.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldtext.vert.qsb distancefieldtext.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldtext.frag.qsb distancefieldtext.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldtext_fwidth.frag.qsb distancefieldtext_fwidth.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldtext_a.frag.qsb distancefieldtext_a.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldtext_a_fwidth.frag.qsb distancefieldtext_a_fwidth.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldshiftedtext.vert.qsb distancefieldshiftedtext.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldshiftedtext.frag.qsb distancefieldshiftedtext.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldshiftedtext_fwidth.frag.qsb distancefieldshiftedtext_fwidth.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldshiftedtext_a.frag.qsb distancefieldshiftedtext_a.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldshiftedtext_a_fwidth.frag.qsb distancefieldshiftedtext_a_fwidth.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldoutlinetext.vert.qsb distancefieldoutlinetext.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldoutlinetext.frag.qsb distancefieldoutlinetext.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldoutlinetext_fwidth.frag.qsb distancefieldoutlinetext_fwidth.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldoutlinetext_a.frag.qsb distancefieldoutlinetext_a.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o distancefieldoutlinetext_a_fwidth.frag.qsb distancefieldoutlinetext_a_fwidth.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o hiqsubpixeldistancefieldtext.vert.qsb hiqsubpixeldistancefieldtext.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o hiqsubpixeldistancefieldtext.frag.qsb hiqsubpixeldistancefieldtext.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o hiqsubpixeldistancefieldtext_a.frag.qsb hiqsubpixeldistancefieldtext_a.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o loqsubpixeldistancefieldtext.vert.qsb loqsubpixeldistancefieldtext.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o loqsubpixeldistancefieldtext.frag.qsb loqsubpixeldistancefieldtext.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o loqsubpixeldistancefieldtext_a.frag.qsb loqsubpixeldistancefieldtext_a.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o shadereffect.vert.qsb shadereffect.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o shadereffect.frag.qsb shadereffect.frag
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o sprite.vert.qsb sprite.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o sprite.frag.qsb sprite.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o visualization.vert.qsb visualization.vert
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -O -c -o visualization.frag.qsb visualization.frag
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext.frag.qsb
deleted file mode 100644
index 4b775fab75..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext.vert.qsb b/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext.vert.qsb
deleted file mode 100644
index fd8f8465d1..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_a.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_a.frag.qsb
deleted file mode 100644
index c9b59f7373..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb
deleted file mode 100644
index 6054685664..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb
deleted file mode 100644
index 22141bc69b..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext.frag.qsb
deleted file mode 100644
index 0e1d8c558c..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext.vert.qsb b/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext.vert.qsb
deleted file mode 100644
index a5764aa06c..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_a.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_a.frag.qsb
deleted file mode 100644
index 5174bed978..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb
deleted file mode 100644
index d664f3d223..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb
deleted file mode 100644
index 82fc991f43..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldtext.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldtext.frag.qsb
deleted file mode 100644
index 77efd80911..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldtext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldtext.vert.qsb b/src/quick/scenegraph/shaders_ng/distancefieldtext.vert.qsb
deleted file mode 100644
index f2ec30c757..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldtext.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldtext_a.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldtext_a.frag.qsb
deleted file mode 100644
index f28b6df278..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldtext_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldtext_a_fwidth.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldtext_a_fwidth.frag.qsb
deleted file mode 100644
index f420bf5f23..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldtext_a_fwidth.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/distancefieldtext_fwidth.frag.qsb b/src/quick/scenegraph/shaders_ng/distancefieldtext_fwidth.frag.qsb
deleted file mode 100644
index 4373f625ce..0000000000
--- a/src/quick/scenegraph/shaders_ng/distancefieldtext_fwidth.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/flatcolor.frag.qsb b/src/quick/scenegraph/shaders_ng/flatcolor.frag.qsb
deleted file mode 100644
index 1fa16190c9..0000000000
--- a/src/quick/scenegraph/shaders_ng/flatcolor.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/flatcolor.vert.qsb b/src/quick/scenegraph/shaders_ng/flatcolor.vert.qsb
deleted file mode 100644
index 87442cde0b..0000000000
--- a/src/quick/scenegraph/shaders_ng/flatcolor.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb b/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb
deleted file mode 100644
index 0204ca992d..0000000000
--- a/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb b/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb
deleted file mode 100644
index 2ec5f72563..0000000000
--- a/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb b/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb
deleted file mode 100644
index d90384a974..0000000000
--- a/src/quick/scenegraph/shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext.frag.qsb b/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext.frag.qsb
deleted file mode 100644
index bd9aaf243b..0000000000
--- a/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext.vert.qsb b/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext.vert.qsb
deleted file mode 100644
index 6050bb6d16..0000000000
--- a/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb b/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb
deleted file mode 100644
index 0593243f36..0000000000
--- a/src/quick/scenegraph/shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/opaquetexture.frag.qsb b/src/quick/scenegraph/shaders_ng/opaquetexture.frag.qsb
deleted file mode 100644
index beb6e97b0d..0000000000
--- a/src/quick/scenegraph/shaders_ng/opaquetexture.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/opaquetexture.vert.qsb b/src/quick/scenegraph/shaders_ng/opaquetexture.vert.qsb
deleted file mode 100644
index 835c046830..0000000000
--- a/src/quick/scenegraph/shaders_ng/opaquetexture.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext.frag.qsb b/src/quick/scenegraph/shaders_ng/outlinedtext.frag.qsb
deleted file mode 100644
index cf7e60e620..0000000000
--- a/src/quick/scenegraph/shaders_ng/outlinedtext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext.vert.qsb b/src/quick/scenegraph/shaders_ng/outlinedtext.vert.qsb
deleted file mode 100644
index 160b77531c..0000000000
--- a/src/quick/scenegraph/shaders_ng/outlinedtext.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag.qsb b/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag.qsb
deleted file mode 100644
index c6465c612d..0000000000
--- a/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/shadereffect.frag.qsb b/src/quick/scenegraph/shaders_ng/shadereffect.frag.qsb
deleted file mode 100644
index 3a5dc85b98..0000000000
--- a/src/quick/scenegraph/shaders_ng/shadereffect.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/shadereffect.vert.qsb b/src/quick/scenegraph/shaders_ng/shadereffect.vert.qsb
deleted file mode 100644
index 97f0395f35..0000000000
--- a/src/quick/scenegraph/shaders_ng/shadereffect.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/smoothcolor.frag.qsb b/src/quick/scenegraph/shaders_ng/smoothcolor.frag.qsb
deleted file mode 100644
index e598857192..0000000000
--- a/src/quick/scenegraph/shaders_ng/smoothcolor.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/smoothcolor.vert.qsb b/src/quick/scenegraph/shaders_ng/smoothcolor.vert.qsb
deleted file mode 100644
index e301f561ce..0000000000
--- a/src/quick/scenegraph/shaders_ng/smoothcolor.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/smoothtexture.frag.qsb b/src/quick/scenegraph/shaders_ng/smoothtexture.frag.qsb
deleted file mode 100644
index 12d3465f66..0000000000
--- a/src/quick/scenegraph/shaders_ng/smoothtexture.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/smoothtexture.vert.qsb b/src/quick/scenegraph/shaders_ng/smoothtexture.vert.qsb
deleted file mode 100644
index 2f7fa1bcd9..0000000000
--- a/src/quick/scenegraph/shaders_ng/smoothtexture.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/sprite.frag.qsb b/src/quick/scenegraph/shaders_ng/sprite.frag.qsb
deleted file mode 100644
index 479695b7fe..0000000000
--- a/src/quick/scenegraph/shaders_ng/sprite.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/sprite.vert.qsb b/src/quick/scenegraph/shaders_ng/sprite.vert.qsb
deleted file mode 100644
index 0c2fd4f403..0000000000
--- a/src/quick/scenegraph/shaders_ng/sprite.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/stencilclip.frag.qsb b/src/quick/scenegraph/shaders_ng/stencilclip.frag.qsb
deleted file mode 100644
index 7505d2c918..0000000000
--- a/src/quick/scenegraph/shaders_ng/stencilclip.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/stencilclip.vert.qsb b/src/quick/scenegraph/shaders_ng/stencilclip.vert.qsb
deleted file mode 100644
index cd94715353..0000000000
--- a/src/quick/scenegraph/shaders_ng/stencilclip.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/styledtext.frag.qsb b/src/quick/scenegraph/shaders_ng/styledtext.frag.qsb
deleted file mode 100644
index 41c3419709..0000000000
--- a/src/quick/scenegraph/shaders_ng/styledtext.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/styledtext.vert.qsb b/src/quick/scenegraph/shaders_ng/styledtext.vert.qsb
deleted file mode 100644
index 96d60d5e88..0000000000
--- a/src/quick/scenegraph/shaders_ng/styledtext.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/styledtext_a.frag.qsb b/src/quick/scenegraph/shaders_ng/styledtext_a.frag.qsb
deleted file mode 100644
index 45a3366a33..0000000000
--- a/src/quick/scenegraph/shaders_ng/styledtext_a.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/textmask.frag.qsb b/src/quick/scenegraph/shaders_ng/textmask.frag.qsb
deleted file mode 100644
index da5f54db15..0000000000
--- a/src/quick/scenegraph/shaders_ng/textmask.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/textmask.vert.qsb b/src/quick/scenegraph/shaders_ng/textmask.vert.qsb
deleted file mode 100644
index c2554dceb3..0000000000
--- a/src/quick/scenegraph/shaders_ng/textmask.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/texture.frag.qsb b/src/quick/scenegraph/shaders_ng/texture.frag.qsb
deleted file mode 100644
index b7b5c481a7..0000000000
--- a/src/quick/scenegraph/shaders_ng/texture.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/texture.vert.qsb b/src/quick/scenegraph/shaders_ng/texture.vert.qsb
deleted file mode 100644
index fba7d35301..0000000000
--- a/src/quick/scenegraph/shaders_ng/texture.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/vertexcolor.frag.qsb b/src/quick/scenegraph/shaders_ng/vertexcolor.frag.qsb
deleted file mode 100644
index 24ec283c72..0000000000
--- a/src/quick/scenegraph/shaders_ng/vertexcolor.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/vertexcolor.vert.qsb b/src/quick/scenegraph/shaders_ng/vertexcolor.vert.qsb
deleted file mode 100644
index e1d3ce6d61..0000000000
--- a/src/quick/scenegraph/shaders_ng/vertexcolor.vert.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/visualization.frag.qsb b/src/quick/scenegraph/shaders_ng/visualization.frag.qsb
deleted file mode 100644
index af5b9b5b96..0000000000
--- a/src/quick/scenegraph/shaders_ng/visualization.frag.qsb
+++ /dev/null
diff --git a/src/quick/scenegraph/shaders_ng/visualization.vert.qsb b/src/quick/scenegraph/shaders_ng/visualization.vert.qsb
deleted file mode 100644
index c44d8a6dc2..0000000000
--- a/src/quick/scenegraph/shaders_ng/visualization.vert.qsb
+++ /dev/null