From 6ad68a6da8d27991fd7bbffc396926a34159198a Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Fri, 22 Dec 2023 13:57:45 +0100
Subject: [PATCH] Qt5/RHI supported

---
 playground/parrots/Overlay.cpp               |  15 ++--
 playground/parrots/TextureFilterMaterial.cpp |  78 +++++++++++++------
 playground/parrots/TextureFilterMaterial.h   |   2 +-
 playground/parrots/shaders/blur.frag.qsb     | Bin 1696 -> 1731 bytes
 playground/parrots/shaders/blur.vert.qsb     | Bin 1378 -> 1394 bytes
 playground/parrots/shaders/rgbswap.frag.qsb  | Bin 1206 -> 1212 bytes
 src/nodes/QskSceneTexture.cpp                |  41 +++++-----
 7 files changed, 86 insertions(+), 50 deletions(-)

diff --git a/playground/parrots/Overlay.cpp b/playground/parrots/Overlay.cpp
index e2e7946c..5dc0ef44 100644
--- a/playground/parrots/Overlay.cpp
+++ b/playground/parrots/Overlay.cpp
@@ -34,14 +34,15 @@ namespace
     class FilterNode : public TextureFilterNode
     {
       public:
-        FilterNode( QSGTexture* texture )
+        FilterNode( bool useRhi, QSGTexture* texture )
         {
             QString shaders[] = { ":/shaders/blur.vert", ":/shaders/blur.frag" };
 
-#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
-            shaders[0] += ".qsb";
-            shaders[1] += ".qsb";
-#endif
+            if ( useRhi )
+            {
+                shaders[0] += ".qsb";
+                shaders[1] += ".qsb";
+            }
 
             setFlag( QSGNode::OwnsMaterial, true );
             setTextureMaterial( new Material( shaders[0], shaders[1] ) );
@@ -150,7 +151,9 @@ namespace
                 QObject::connect( texture, &QskSceneTexture::updateRequested,
                     overlay, &QQuickItem::update );
 
-                textureNode = new FilterNode( texture );
+                const bool useRhi = qskRenderingHardwareInterface( window );
+
+                textureNode = new FilterNode( useRhi, texture );
                 texture->setTextureNode( textureNode );
             }
 
diff --git a/playground/parrots/TextureFilterMaterial.cpp b/playground/parrots/TextureFilterMaterial.cpp
index dccc1905..57c240b0 100644
--- a/playground/parrots/TextureFilterMaterial.cpp
+++ b/playground/parrots/TextureFilterMaterial.cpp
@@ -9,6 +9,12 @@
 #include <qsgmaterialshader.h>
 #include <qsgtexture.h>
 
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+    #include <qsgmaterialrhishader.h>
+    using RhiShader = QSGMaterialRhiShader;
+#else
+    using RhiShader = QSGMaterialShader;
+#endif
 
 #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
 
@@ -74,31 +80,26 @@ namespace
     };
 }
 
-QSGMaterialShader* TextureFilterMaterial::createShader() const
-{
-    Q_ASSERT( !( flags() & QSGMaterial::RhiShaderWanted ) );
-
-    auto shader = new ShaderGL();
-
-    shader->setSource( QOpenGLShader::Vertex, m_shaderSourceFiles[ 0 ] );
-    shader->setSource( QOpenGLShader::Fragment, m_shaderSourceFiles[ 1 ] );
-
-    return shader;
-}
-
-#else // Qt6
+#endif
 
 namespace
 {
-    class Shader : public QSGMaterialShader
+    class ShaderRhi : public RhiShader
     {
       public:
-        Shader()
+        ShaderRhi()
         {
             setFlag( UpdatesGraphicsPipelineState, true );
         }
 
-        void setSource( QSGMaterialShader::Stage stage, const QString& filename )
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+        void setSource( QOpenGLShader::ShaderType type, const QString& fileName )
+        {
+            setShaderSourceFile( type, fileName );
+        }
+#endif
+
+        void setSource( Stage stage, const QString& filename )
         {
             setShaderFileName( stage, filename );
         }
@@ -139,20 +140,50 @@ namespace
             auto mat = dynamic_cast< TextureFilterMaterial* >( newMaterial );
             if ( auto txt = mat->texture() )
             {
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+                txt->updateRhiTexture( state.rhi(), state.resourceUpdateBatch() );
+#else
                 txt->commitTextureOperations( state.rhi(), state.resourceUpdateBatch() );
+#endif
                 *texture = txt;
             }
         }
     };
 }
 
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+
+QSGMaterialShader* TextureFilterMaterial::createShader() const
+{
+    if ( flags() & QSGMaterial::RhiShaderWanted )
+    {
+        auto shader = new ShaderRhi();
+
+        shader->setSource( ShaderRhi::VertexStage, m_shaderFiles[ 0 ] );
+        shader->setSource( ShaderRhi::FragmentStage, m_shaderFiles[ 1 ] );
+
+        return shader;
+    }
+    else
+    {
+        auto shader = new ShaderGL();
+
+        shader->setSource( QOpenGLShader::Vertex, m_shaderFiles[ 0 ] );
+        shader->setSource( QOpenGLShader::Fragment, m_shaderFiles[ 1 ] );
+
+        return shader;
+    }
+}
+
+#else
+
 QSGMaterialShader* TextureFilterMaterial::createShader(
     QSGRendererInterface::RenderMode ) const
 {
-    auto shader = new Shader();
+    auto shader = new ShaderRhi();
 
-    shader->setSource( Shader::VertexStage, m_shaderSourceFiles[ 0 ] );
-    shader->setSource( Shader::FragmentStage, m_shaderSourceFiles[ 1 ] );
+    shader->setSource( ShaderRhi::VertexStage, m_shaderFiles[ 0 ] );
+    shader->setSource( ShaderRhi::FragmentStage, m_shaderFiles[ 1 ] );
 
     return shader;
 }
@@ -160,11 +191,14 @@ QSGMaterialShader* TextureFilterMaterial::createShader(
 #endif
 
 TextureFilterMaterial::TextureFilterMaterial(
-        const QString& vertexShaderSourceFile,
-        const QString& fragmentShaderSourceFile )
-    : m_shaderSourceFiles{ vertexShaderSourceFile, fragmentShaderSourceFile }
+        const QString& vertexShaderFile, const QString& fragmentShaderFile )
+    : m_shaderFiles{ vertexShaderFile, fragmentShaderFile }
 {
     setFlag( Blending | RequiresFullMatrix, true );
+
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+    setFlag( SupportsRhiShader, true );
+#endif
 }
 
 TextureFilterMaterial::~TextureFilterMaterial()
diff --git a/playground/parrots/TextureFilterMaterial.h b/playground/parrots/TextureFilterMaterial.h
index cf58950b..93a7c9b9 100644
--- a/playground/parrots/TextureFilterMaterial.h
+++ b/playground/parrots/TextureFilterMaterial.h
@@ -32,5 +32,5 @@ class TextureFilterMaterial : public QSGMaterial
 
   private:
     QSGTexture* m_texture = nullptr;
-    const QString m_shaderSourceFiles[ 2 ];
+    const QString m_shaderFiles[ 2 ];
 };
diff --git a/playground/parrots/shaders/blur.frag.qsb b/playground/parrots/shaders/blur.frag.qsb
index 40d031bc0d94bffb458704834af81c09be3d8c19..9d04e783873932f85fbb74eba5500cecade2ba7c 100644
GIT binary patch
literal 1731
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
ZeUy_@&g=Wb0sTQCaUin0?7xRWYV7v|Xkh>V

literal 1696
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

diff --git a/playground/parrots/shaders/blur.vert.qsb b/playground/parrots/shaders/blur.vert.qsb
index f530ee4d1fafc4939f582e6b23296c608538783a..018f8b19961250b0a17765c18964c1cd60e4028d 100644
GIT binary patch
literal 1394
zcmV-&1&#Uu02~~6ob6dzZ`(!?ULBTW`ik$iPLp+<LvjLDHk_u2D#Jliv;hJ*h>M_r
zU=T7zxojoU=Ha7(ANvFP(qGcw)8CNCz7*}u?vPxPRsy3=p%|e-@9xaEbM10=$7YNT
zG5HkWy~-?RGo2aCfghK(ftH6i_YXZR`Aif3kePt?;rB66i^%FbLuUto)JZ<h1Nra{
z_nCn_En`tX`G_vDT^6to^sYb~_Ma*!lrYA6tOb_1-~(DcO1w=4cQx!xfbxBS8vyp%
z2`SnPojuPpM*7!ciwl1kyFsU8x*Qt*h`Z*V<@u&t-mO)%*BXb%b&m92>nF$MovzdJ
z*N@kE0AQf`u5}D^_FKl!PN(CUe%Yv1>SB_BN}L0H%Rfm0*8zB1*EG%ZTfSwGY`)jk
zUpSuSTaH~%u-3TYIBq*lv~2wh`a04NP1iS%lMJpO_&UH%w~m_K!0`F@i)Sxi=}%n8
z^Ymx-e&CbeX-VL~_uu^RWNYi?)0*OBY=Z(=RihB;Q~(d9_h*=}75FI|$n`$@6EOqK
z_A4cVsN>MF+8kYg6|?MexU5oULx~_#Rap(*3%cdV|NH8)S2FPGFEAl?btS<&0#h_C
z>n0Z_WmbU0n(djoh5gXpD9R0$TTPlDFIEN>ZU=<LW+q|E?m(ClG)Xwa0Xf|f0|`<o
z)nq&qyE}so-BbK=O+Rq$l#){oKYp}}l0lnVcyo`I!D<iHt=4MM27`s8F!pfA$Td{=
zD1D@I#{{<3aonCr3ApCCiCXT7W$!^qjOa^j`5<LC@J&gLS0ceke2XzB`#FkzdhRWX
z_Ejkrt?<-3pKp7nqI#@k&Np#X*9I@D7ah7}EEw%DIx&jHLVkG|yBZvF_lPkC2TM*I
zWhK#m`+WO()$`lc^#?V1iWNcuY?5iBkLOpYV}y=DJoXmhT|yavK>Bskf#Xpcqnz*H
z0x?0n(Fjuzw7lRK*(}kA2p^7@sa0viq(7wP2)9XcXGt#FF%Ruc#jbg>IUFyh>|UZV
z>X-p3d4Vs8s9=8{dL?K%ybFLwT#0xb##flUCLz5};}N1EUn6@%zD6<0k-Tw|R}^;0
z7>(21Ns==`b0;YdNSlN46xoHc?$LOfeES5(GbBsOmNB0peJFp9{Fo*AbHd-)w*~6Y
z(D*abHBNXOFA@#;*U7ff{?N7(;W@2Ej_hA1`x)7f<6BDXZd1Rc@GE4~m#`P|EWT?Y
z?k}L=ernJ<jZv&OfIC9t$ADN6@sYkx6CQp1l;{mwmuuwTZ!ibPpA+U9$w7Z_(3(t>
zo*RTi8EE%S^7%20(4RXB{+5EfOT1q}E{@AI_pUN`MVVV6eJh0h8>0G^h-{P}isUjq
z`Ke{gHo8IE<X`tpztz<t4Ro#D4K1d7R<Hd9{;K}C0g2JW9B8+CrU&`b<YHF+j4T`7
zKi`pQX(HNJ!&CFD%T%)&cyP__I)+`V?CkWtP&J$T)J0H6x@GsfEjF7`!Y-#YC|5=m
zwOR>Pkch|u*(--CVLD6<FD^Sf_rWI{hPDXS9g)}pATRbpc_lihLW%e``0G<?mZMxh
zEIW0nax(Xr^vRLFU(vP2k+&7hMMFX}eU!h)yM_H3pR5lq@MJ~z)Ke8AmO4%)<$pX!
z)yfMq$?Z#DdA;Wf>q9S~2B{+Y&`KSA-VAi9^L~?wTA-xLz5y&yK9sVLvAER16wTFA
zhZFUDrOt@xzpd1{EM?BevgYE-nn5o+-cbesBY*I*4EQf)K<rbTy;Ri0OH(YQW{8Xp
zC^c!PAxGybGw^&|8lW-*NP~S07FniRi7s7?{_~akKT?LD`m4ZO`I-6u0;`mI3jhze
ADF6Tf

literal 1378
zcmV-o1)cf;033XHob6d{Puo@$zIh=G1Esu`ZFH?EeMxAQ1(dE6SrAoQZIvofm8qH(
zA<H-p^Oo3PU-PnxkNW}p(qFRQv){0f`!a3k+<R=_I7v4&It5fC+xNUb=lGn<6)?s=
zV)DwteU&-PWd^gD2R}Y*0xt`9<}bQf>Y5>gLuP|IhvzYH^C%i@Vz2{HH7EiaLIk)+
z2brKy>j5<|0;(6-E(=+UVSZt}eyV7piwV|YCSdU)4Fo<;vQ0(rYP7fl(f2{!0%gul
zD9~n<?|EGrdQZ^1nTT?FF1tL6DjKAv6L%U?$q4WT@&5Y7_KR}Bo8{`mio~6Z9Z#__
zu|~ul({XV<#$@7{=px#K6nQtuKhonwqmOUc2>6uOc&w8XysVJt*&OjlNI#;N>8<ic
zDR#umklrTwog=@9;~KngDY%ecQs_km_bgatg*+!Jfa`0pD!?0Sw*dMWyFfA>XdH$d
zVX6^5Mm&^jgfEh7RD%rpn<RgEfkW10l5D5Q&lR$rqP&qe5A-zQLSOfZo}pYm26~o!
zN#C-@vlI{g&r=?A<bPh|o8-1Y>sg{drC5`skMtt(P=153q5KQ@Hd&T*I`aPj4u0P{
z)p3Gqu>sOCq923Cg1|4a%#c1}_=Na%s@rvn{|ne4{Tb<8CqIbiCe>_);@l*?KLPcZ
za&+=hU$bO(K#<R?vvZ#WXPX^Otlu>|*o&8Cevn=w8e@Ezr}LX9q$6wv(%0!*WC;H<
z;b(*&>Dx-}?$ElR$V-H2*yj~}Ansd~^JAbepSz0wZAI@M$$kdENEgZWo?^SA*p?{X
z3hDOQACPFW<oE6G%ZIifIG(GoRw|kna6h!Tz8ki*H<}Jt$K+Lf_|9=nFj{TT<hr+S
zS`I&{X{R+!3tgw>`5m;<LwEq|(DY9ncTYdGtu@{9Jil4fOb%XlLvBm1;~M=0RTKaw
zZXcr`&uQuiy;veZ!bYzv=E&V^8!x@U;h0EWfGA7Q`ikoBRMQ630`AQEP}d@n$gsu%
zH^9X9&%aD5)$&iE9ESr{Rd&>`s>dw3lnz@PzN)_e4vT7$>aZcK#YO6{w@QcomQ?lO
zIabvRc~?apH(g4}`Jemgt<q0RLzFqNhP!R>WU!WWP412bVOn5^nXl`<z2^kn_KUlf
z2&?ZM86EQn&zG51kE;TjLD1H9sN;`bs}<P1XjMvTiG?23Ii*-F$-=|uGPz@sZxws3
zOB8>GZe~)zZa-=>QbTONeE#aS@x=Fnz<BQNhn(_DTL92+pMCdaYwOk1ijqtcOHo*r
zN%V=Z74lRF%3y%|uGB$i`?XSt)2N9Mp>gI;>V)lLoZbWV>y<=%^x~G?+EXzdio9nV
z4z42raaHQ7wA_s+DQ=IJ+SN*WlF<j5H1`A{l~hi-JM*q~>d}pGD?ojlhrXK%ayn>$
zVE4)Wdg%v96?E-u?{~10DkPg*qVVYAPu|)0@u3;i1ZKCI(j6CNp7SjEdn=Cj^s?hx
z?XYR<Uv+G5wvB){+s^KWmhc0o)BGGC<?lD(=n&wk(=|JG0P|_<!m8Hi91>6eKb%F#
z5b;$IbH7$@G{OKjnYL%SmD0}6z;<pl_GyVqJ>DI6(5yBZ@j<wlil7Xvs<m2*LXe9%
z0l6whA;BCBqqf=Ec>p=NK)Rw>cg2)|g4|X`@KSt|i#+08*Wa8<Sf29n9XHj|UQZXL
zPgd#frl#>^uVAx`h{&mKf!#lQ@S$7&OSkmf<5jIkm!_vu7GkppEp@+7s~r8SZcH8M
k<G*P!`uAAsywW32?SJo-_p@gdBkd=;()Qx|8~=cMGTPF}MF0Q*

diff --git a/playground/parrots/shaders/rgbswap.frag.qsb b/playground/parrots/shaders/rgbswap.frag.qsb
index 7ce873e79a7380bfcb360213f5edf81294023a0f..fdf072831ce4c1e97462f9b8cce6f395cabca26e 100644
GIT binary patch
literal 1212
zcmV;t1Vj4(01bh7oXuBXZyQArU)yoqTxl8#4oTCN4Uv!ykujEw5U!)3m_L;&1=UeO
zGS=yGUONZ&opraDI#l@zJo26RDm?PU3xb*5xx0;HmpmZEMfYcBXMQvD+u8MoF;--Z
zt-zgw+hQ&Y;4fqYkn(V|zvyCDFSNeLhG6Ni5jz5(vGUVcuk%`Erz{3f#%{qo`R*82
z821e}0b~h?9-D!Do5l_eyN%>y9YRmR+y!IFE-27plFYIzr{YB5977zJ36Lw4b?$YJ
zbgh!z%+UR|cP_%n3w-`@qi$J|3}aXF(|BmTvN&85M>g>hdb5^N499^Zc`$WcPhPaF
z%a&!uzBdfQ33~Au9)>D%CeyJ98yy}6ap(#dI(Nbg&mZw~;WoG%1mOUcfj59Ko?od_
zU>I(4m$$hTGZ}}X(Wz*NeeG1$>5Rtqm!UK2IMV6W`(W<YE`FN5<R7R^YFVC^h4f+w
zV&NBqh2Jw49{)Eic>Wavf>`Q`hfvH>Fb={Sk+P7I6ym0AVE;CZcK+1`<Dm#uDWCCB
zjJ!ySuyR^Y@(6>M_Qd%CLMS4dv!)7QYl^@J0{s{ahmnvKw_Y_lQ+AZdoME%7nLJ5m
z{E0?CAll4aB%*dTuU+X#!EJ416WOM5gvKzdj`UoeMoPS?yvjZ`LHC=d&tKR_VGu?3
zQ-2yuqQHcKSSMe6cXWLGyi?aDEO0)K<(#(>4-mR9>=P#(2}uxY_R+w;(gNg(O`r>|
zX%;GT_1~~3Y_lh>r>ooV8V4L`8wuOP?<6tJMB5yy5y?pgREbtB2&P>FC1@j4Q!|S&
zW=b`rfR6F!050d3{2<#Xa}Tm5U$0x!P`I9w&b-mtRI}W=ruKZ<`uDd7jr~8}Dp%Bx
zPPRGh?s>jDjt7E2nF#5O?MM#B-sypr=_7A4_y`}hvjeCy!V-LEA|i+&xbj-WV!D<5
z1C!*4`PFf*mo2GY&&7A8UhVf6czXV#mE7ya5$qV_!1Xgf#GDA<h^fCS2@*60cqX0S
z?<4U(h`y@teMK-B=xtRcw4YAaK<{$tCfDmFo4dA4_A@=)1p!MVt+J`6ZJ1<-cbmVu
zY%SR`w0FgT+=misX14@$3vNlX7>h5^YYv;Is8XSp8D!m4_`Z<eE8!xv;579fY2Soj
zAY7KW;e>+kuby?E)u63v&BqF3ofXpa&s|nhEr~aEDEKp0W_Z3TD18Yr;Oh>&lNgD-
zOE@T_-y>tZY{*}OyiMOlB^Oh9FSW^ZC8p1Ji7rQWhYGu(ba{%iGndy6<%QQ<V3k*L
zK~;_4oA8BaHxBnZV2`m@i31MLTNEGfZMMcNmYwy?E0K2q56`C-`6tU8buE(bkPhSB
zCA>V@Z=`df?Kfx+ay0%nybF|1i{vutwm{yZu@%L)=6Q=^p#Ob}wN3u_RnA&h2KfPT
zf$=^h`Joa25!oW%Coms*mL04yhd)45By8kvjq+)Oj2x^}{cWoK9@Y0Pc$L%~X&clZ
z0OA_y+B7$tgn10llHyS7HYvxvk;~_RiTS=uH9jPqWWG`VGsWE{EKYIDr27+4Kh?8q
a9_i+ebxOYWZvy@MFt^JuxBVNg#_%(l*;O|H

literal 1206
zcmV;n1WEe<01d==oXuC=ZyQArUw@<~*R%}<hoouChDgYU$Qa8-2-i_i!bhb_L3LD+
zjCH!4*Uo``XWi|k4psgI9{Hd6S9s)!7X&lAb9bAI6Y_u%8|~fB?0o)acF$pqy}=kO
z!z{qGn9BnA3)v8;B24xd4VD`yexHp%)L~<`4@wiIsEu8#c8eXe7*x@BoURWHDfGO;
zreIovNsrBezD;|3hTLkhxC_2#Ant;&WM|}PFNx-=QBZy&P>#Wm%LLFh3cGNf;!Vdb
zdJi*J>HAV~yMp#D$p1a!z6m*_$J?NS@2{Tso;M;nY_y*=b%Lcd;(M&3(!x1)JYVZG
zR%M7tN%1Ra16Ft7o%l%TEwY0&>OD60s|Niw&>OT~QuI<vZ>KUDuflXi5?+Di_LS|C
z;uXoyW-hKxiVMeEAXQX!No9@eHCQ2-9OgS9Um<YIidR-$T%ozamH}J6pRZy<Z-PDS
zD2w!0h>yGu(RYZ4{_c^zBFV3&wb1gbRD%NTzYXsa#nU0WO1yQT*J-b;@YXo5lMmE?
zK)yCe|AC5G^Qu5UBrMS1heSUz{68jHwD$?rqsX$OfHC|5oF%f2*ez2$U7!(zyOe*I
za=%aceG6I@RU<8f{9UlPOuR1DW{qqf!n2|<)Vwu{v1r8dIoQN_-=!QMk)5R8$p4xA
zZjmiceyha$6Rdu!t6Qcsfy6K?dEw#qsR$!4@cGBhrZo$N>nZBQ8=uVhXc9QGbBXQw
zz_cP6#;)YY@yL2@aTrraw(${q^NwODbso$d*OO-*>l~C~-x~$t6t#E^4}+y`N6vIM
z5n=0qM?oCA0t8N-@XYha{8YFt?gl|PL}uU(IVM%BlY7{1bC-9y6muDeqIFQyCU&$^
zT?aLu*k6Xu_`s1)zc~PLw{iB<{1yK|#nZ^5wX7U&^X$a1-!j}<&3_+@|1k=`7%2Rn
zq44CtLBaDc01(7dXFP&r_Jc_f-UyV1kfbJViUuCnRt84#R~LjwB2=k-#zQgoA}PY!
zaWjb{3|`q&=Lc}1fN0O#%7LvR0v&MlV=x*;Le|`7-Na1EQ6M?Nc3mTRlvMnww!TZS
znXyQ;+S9o9q$35lwUA9<o5B$aLscE=xjKv#c$0Y%eQJW<H_u+YwD-dxitK0pES3a;
zX$E{9eevD?;o*yercPmj@?k7<+J--{(0gegIpJ7HGNG!E0``R#AWdunop3{=P|M|i
z!=A9sp12&YZof+yaDZ(rY!BB-U>b?8xz!+$lL#mi%~;?}s|JeDLMEqSCSg=cHKc%!
z@pA^w%_hh1<BHMbTic%RPU4~9Pp3jU6B~YyO}yh>E8|DrbodcI8YjDOm?ONkd}k^m
zfJ|_uwdnJa9*KXrFh~*OYhuh-wMM`1;=9(Y4+aY~J%3S0_WN-Joj(a&Khr~-Q{fvv
z^{SRwf-fRyCKVhEu!(#ieU;z)s$)PvUk@svo%DVl>eHGY)_y;^q_kXeF7<W~2uzK*
zN~WIPwn=n2yZrTe=Ze<X+BL)E4y4d9J3q)Z&J{PJ(L{mn9c-Q@6$)LExoa~0mBSYN
UPm$}kYh@YHc^x(W1}CWSM<)4MJpcdz

diff --git a/src/nodes/QskSceneTexture.cpp b/src/nodes/QskSceneTexture.cpp
index 58695720..c8fa4493 100644
--- a/src/nodes/QskSceneTexture.cpp
+++ b/src/nodes/QskSceneTexture.cpp
@@ -202,32 +202,31 @@ namespace
 
     void Renderer::createTarget( const QSize& size )
     {
-==== BASE ====
-        const auto rhi = context()->rhi();
-==== BASE ====
+        if ( const auto rhi = context()->rhi() )
+        {
+            auto flags = QRhiTexture::RenderTarget | QRhiTexture::UsedAsTransferSource;
 
-==== BASE ====
-        auto flags = QRhiTexture::RenderTarget | QRhiTexture::UsedAsTransferSource;
-==== BASE ====
+            m_rhiTexture = rhi->newTexture( QRhiTexture::RGBA8, size, 1, flags );
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+            m_rhiTexture->build();
+#else
+            m_rhiTexture->create();
+#endif
 
-==== BASE ====
-        m_rhiTexture = rhi->newTexture( QRhiTexture::RGBA8, size, 1, flags );
-        m_rhiTexture->create();
-==== BASE ====
+            QRhiColorAttachment color0( m_rhiTexture );
+            auto target = rhi->newTextureRenderTarget( { color0 } );
 
-==== BASE ====
-        QRhiColorAttachment color0( m_rhiTexture );
-        auto target = rhi->newTextureRenderTarget( { color0 } );
-==== BASE ====
+            target->setRenderPassDescriptor(
+                target->newCompatibleRenderPassDescriptor() );
 
-==== BASE ====
-        target->setRenderPassDescriptor(
-            target->newCompatibleRenderPassDescriptor() );
-==== BASE ====
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+            target->build();
+#else
+            target->create();
+#endif
 
-==== BASE ====
-        target->create();
-==== BASE ====
+            m_rt.rt = target;
+            m_rt.rpDesc = target->renderPassDescriptor();
 
             auto defaultContext = qobject_cast< QSGDefaultRenderContext* >( context() );
             m_rt.cb = defaultContext->currentFrameCommandBuffer();