Bake shaders at build time

Change-Id: Ia6879ca75750ceb54f145dab9d25ac1ed78289a2
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 59 insertions, 63 deletions

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