Clean up QT_CONFIG(opengl)

Accelerated graphics is now possible without OpenGL support. With
this change, a Qt build with -no-opengl can still run Qt Quick with
a Vulkan, Metal, or Direct3D backend.

Fixes: QTBUG-84027
Change-Id: Ib63c733d28cfdf7de16b138df136fa7628e1747b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 34 insertions, 58 deletions

diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 74e1f494d7..5ccce5433c 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -106,8 +106,11 @@ qt_add_module(Quick
         scenegraph/adaptations/software/qsgsoftwarerenderer.cpp scenegraph/adaptations/software/qsgsoftwarerenderer_p.h
         scenegraph/adaptations/software/qsgsoftwarerenderlistbuilder.cpp scenegraph/adaptations/software/qsgsoftwarerenderlistbuilder_p.h
         scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h
+        scenegraph/compressedtexture/qsgcompressedatlastexture.cpp scenegraph/compressedtexture/qsgcompressedatlastexture_p.h
+        scenegraph/compressedtexture/qsgcompressedtexture.cpp scenegraph/compressedtexture/qsgcompressedtexture_p.h
         scenegraph/coreapi/qsgabstractrenderer.cpp scenegraph/coreapi/qsgabstractrenderer_p.h
         scenegraph/coreapi/qsgabstractrenderer_p_p.h
+        scenegraph/coreapi/qsgbatchrenderer.cpp scenegraph/coreapi/qsgbatchrenderer_p.h
         scenegraph/coreapi/qsggeometry.cpp scenegraph/coreapi/qsggeometry.h scenegraph/coreapi/qsggeometry_p.h
         scenegraph/coreapi/qsgmaterial.cpp scenegraph/coreapi/qsgmaterial.h
         scenegraph/coreapi/qsgmaterialshader.cpp scenegraph/coreapi/qsgmaterialshader.h scenegraph/coreapi/qsgmaterialshader_p.h
@@ -117,6 +120,7 @@ qt_add_module(Quick
         scenegraph/coreapi/qsgrenderer.cpp scenegraph/coreapi/qsgrenderer_p.h
         scenegraph/coreapi/qsgrendererinterface.cpp scenegraph/coreapi/qsgrendererinterface.h
         scenegraph/coreapi/qsgrendernode.cpp scenegraph/coreapi/qsgrendernode.h scenegraph/coreapi/qsgrendernode_p.h
+        scenegraph/coreapi/qsgrhivisualizer.cpp scenegraph/coreapi/qsgrhivisualizer_p.h
         scenegraph/coreapi/qsgtexture.cpp scenegraph/coreapi/qsgtexture.h scenegraph/coreapi/qsgtexture_p.h
         scenegraph/qsgadaptationlayer.cpp scenegraph/qsgadaptationlayer_p.h
         scenegraph/qsgbasicglyphnode.cpp scenegraph/qsgbasicglyphnode_p.h
@@ -124,14 +128,31 @@ qt_add_module(Quick
         scenegraph/qsgbasicinternalrectanglenode.cpp scenegraph/qsgbasicinternalrectanglenode_p.h
         scenegraph/qsgcontext.cpp scenegraph/qsgcontext_p.h
         scenegraph/qsgcontextplugin.cpp scenegraph/qsgcontextplugin_p.h
+        scenegraph/qsgdefaultcontext.cpp scenegraph/qsgdefaultcontext_p.h
+        scenegraph/qsgdefaultglyphnode.cpp scenegraph/qsgdefaultglyphnode_p.cpp scenegraph/qsgdefaultglyphnode_p.h
+        scenegraph/qsgdefaultglyphnode_p_p.h
+        scenegraph/qsgdefaultinternalimagenode.cpp scenegraph/qsgdefaultinternalimagenode_p.h
+        scenegraph/qsgdefaultinternalrectanglenode.cpp scenegraph/qsgdefaultinternalrectanglenode_p.h
+        scenegraph/qsgdefaultrendercontext.cpp scenegraph/qsgdefaultrendercontext_p.h
+        scenegraph/qsgdistancefieldglyphnode.cpp scenegraph/qsgdistancefieldglyphnode_p.cpp scenegraph/qsgdistancefieldglyphnode_p.h
+        scenegraph/qsgdistancefieldglyphnode_p_p.h
         scenegraph/qsgrenderloop.cpp scenegraph/qsgrenderloop_p.h
+        scenegraph/qsgrhidistancefieldglyphcache.cpp scenegraph/qsgrhidistancefieldglyphcache_p.h
+        scenegraph/qsgrhilayer.cpp scenegraph/qsgrhilayer_p.h
+        scenegraph/qsgrhishadereffectnode.cpp scenegraph/qsgrhishadereffectnode_p.h
         scenegraph/qsgrhisupport.cpp scenegraph/qsgrhisupport_p.h
+        scenegraph/qsgrhitextureglyphcache.cpp scenegraph/qsgrhitextureglyphcache_p.h
         scenegraph/util/qsgareaallocator.cpp scenegraph/util/qsgareaallocator_p.h
+        scenegraph/util/qsgdefaultimagenode.cpp scenegraph/util/qsgdefaultimagenode_p.h
+        scenegraph/util/qsgdefaultninepatchnode.cpp scenegraph/util/qsgdefaultninepatchnode_p.h
+        scenegraph/util/qsgdefaultpainternode.cpp scenegraph/util/qsgdefaultpainternode_p.h
+        scenegraph/util/qsgdefaultrectanglenode.cpp scenegraph/util/qsgdefaultrectanglenode_p.h
         scenegraph/util/qsgflatcolormaterial.cpp scenegraph/util/qsgflatcolormaterial.h
         scenegraph/util/qsgimagenode.cpp scenegraph/util/qsgimagenode.h
         scenegraph/util/qsgninepatchnode.cpp scenegraph/util/qsgninepatchnode.h
         scenegraph/util/qsgplaintexture.cpp scenegraph/util/qsgplaintexture_p.h
         scenegraph/util/qsgrectanglenode.cpp scenegraph/util/qsgrectanglenode.h
+        scenegraph/util/qsgrhiatlastexture.cpp scenegraph/util/qsgrhiatlastexture_p.h
         scenegraph/util/qsgsimplerectnode.cpp scenegraph/util/qsgsimplerectnode.h
         scenegraph/util/qsgsimpletexturenode.cpp scenegraph/util/qsgsimpletexturenode.h
         scenegraph/util/qsgtexturematerial.cpp scenegraph/util/qsgtexturematerial.h scenegraph/util/qsgtexturematerial_p.h
@@ -205,12 +226,18 @@ set(scenegraph_resource_files
     "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"
@@ -255,25 +282,6 @@ qt_add_resource(Quick "scenegraph"
     FILES
         ${scenegraph_resource_files}
 )
-set(items_resource_files
-    "shaders/shadereffect.frag"
-    "shaders/shadereffect.vert"
-    "shaders/shadereffect_core.frag"
-    "shaders/shadereffect_core.vert"
-    "shaders/shadereffectfallback.frag"
-    "shaders/shadereffectfallback.vert"
-    "shaders/shadereffectfallback_core.frag"
-    "shaders/shadereffectfallback_core.vert"
-)
-
-qt_add_resource(Quick "items"
-    PREFIX
-        "/qt-project.org/items"
-    BASE
-        "items"
-    FILES
-        ${items_resource_files}
-)
 
 
 if(ANDROID)
@@ -383,42 +391,12 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_path
         util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
-    SOURCES
-        items/qquickframebufferobject.cpp items/qquickframebufferobject.h
-        scenegraph/compressedtexture/qsgcompressedatlastexture.cpp scenegraph/compressedtexture/qsgcompressedatlastexture_p.h
-        scenegraph/compressedtexture/qsgcompressedtexture.cpp scenegraph/compressedtexture/qsgcompressedtexture_p.h
-        scenegraph/coreapi/qsgbatchrenderer.cpp scenegraph/coreapi/qsgbatchrenderer_p.h
-        scenegraph/coreapi/qsgrhivisualizer.cpp scenegraph/coreapi/qsgrhivisualizer_p.h
-        scenegraph/qsgdefaultcontext.cpp scenegraph/qsgdefaultcontext_p.h
-        scenegraph/qsgdefaultglyphnode.cpp scenegraph/qsgdefaultglyphnode_p.cpp scenegraph/qsgdefaultglyphnode_p.h
-        scenegraph/qsgdefaultglyphnode_p_p.h
-        scenegraph/qsgdefaultinternalimagenode.cpp scenegraph/qsgdefaultinternalimagenode_p.h
-        scenegraph/qsgdefaultinternalrectanglenode.cpp scenegraph/qsgdefaultinternalrectanglenode_p.h
-        scenegraph/qsgdefaultrendercontext.cpp scenegraph/qsgdefaultrendercontext_p.h
-        scenegraph/qsgdistancefieldglyphnode.cpp scenegraph/qsgdistancefieldglyphnode_p.cpp scenegraph/qsgdistancefieldglyphnode_p.h
-        scenegraph/qsgdistancefieldglyphnode_p_p.h
-        scenegraph/qsgrhidistancefieldglyphcache.cpp scenegraph/qsgrhidistancefieldglyphcache_p.h
-        scenegraph/qsgrhilayer.cpp scenegraph/qsgrhilayer_p.h
-        scenegraph/qsgrhishadereffectnode.cpp scenegraph/qsgrhishadereffectnode_p.h
-        scenegraph/qsgrhitextureglyphcache.cpp scenegraph/qsgrhitextureglyphcache_p.h
-        scenegraph/util/qsgdefaultimagenode.cpp scenegraph/util/qsgdefaultimagenode_p.h
-        scenegraph/util/qsgdefaultninepatchnode.cpp scenegraph/util/qsgdefaultninepatchnode_p.h
-        scenegraph/util/qsgdefaultpainternode.cpp scenegraph/util/qsgdefaultpainternode_p.h
-        scenegraph/util/qsgdefaultrectanglenode.cpp scenegraph/util/qsgdefaultrectanglenode_p.h
-        scenegraph/util/qsgrhiatlastexture.cpp scenegraph/util/qsgrhiatlastexture_p.h
-)
-
-qt_extend_target(Quick CONDITION QT_FEATURE_thread AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
+qt_extend_target(Quick CONDITION QT_FEATURE_thread
     SOURCES
+        scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h
         scenegraph/qsgthreadedrenderloop.cpp scenegraph/qsgthreadedrenderloop_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
-    SOURCES
-        scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h
-)
-
 qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
     SOURCES
         items/qquickanimatedsprite.cpp items/qquickanimatedsprite_p.h
@@ -428,11 +406,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
         items/qquickspritesequence.cpp items/qquickspritesequence_p.h
         items/qquickspritesequence_p_p.h
         scenegraph/adaptations/software/qsgsoftwarespritenode.cpp scenegraph/adaptations/software/qsgsoftwarespritenode_p.h
-)
-
-qt_extend_target(Quick CONDITION QT_FEATURE_thread
-    SOURCES
-        scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h
+        scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h
 )
 
 qt_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
@@ -506,8 +480,10 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
         items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h
 )
 
-#### Keys ignored in scope 41:.:items:items/items.pri:QT_FEATURE_opengl:
-# OTHER_FILES = "$$PWD/shaders/shadereffect.vert" "$$PWD/shaders/shadereffect.frag" "$$PWD/shaders/shadereffectfallback.vert" "$$PWD/shaders/shadereffectfallback.frag" "$$PWD/shaders/shadereffect_core.vert" "$$PWD/shaders/shadereffect_core.frag" "$$PWD/shaders/shadereffectfallback_core.vert" "$$PWD/shaders/shadereffectfallback_core.frag"
+qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
+    SOURCES
+        items/qquickframebufferobject.cpp items/qquickframebufferobject.h
+)
 
 qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
     SOURCES