From deefdf1416aa59ac7b7837b7ea8c8dbf05f2fa54 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 10 Nov 2023 04:24:10 +0800 Subject: [PATCH] used uint instead of int in Size of viewport --- CMSceneGraph | 2 +- doc/Gizmo.odg | Bin 12175 -> 12904 bytes example/common/VulkanAppFramework.h | 12 ++++++------ src/SceneGraph/Vulkan/Debug/VKDebugOut.cpp | 14 ++++++-------- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index 5a12a0ca..679c9d4e 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 5a12a0cac7e4a5b935bd7112f3ec70179c5216b4 +Subproject commit 679c9d4eccdc34e7add4da42d82dfb3e795c5600 diff --git a/doc/Gizmo.odg b/doc/Gizmo.odg index f15de8a0c5959cfbd141ff458f9a2b53adc241b5..81bf4e98eba229337fa9324072108bb67493765a 100644 GIT binary patch literal 12904 zcmcJ01yo!~w{GJEhY&nL0|bJ*TL^9mmf)_9yF0->1eXqw;OrI~@AgPFAzlarMpqqUyBnLVSmjggh1wSgnh$jX7y#7@t~)XczM@ehEH z82=+Ak0mi{D`PVgN4x((*|Rd~85kH@8a-C6?U?>vljturZLDn^Z5}N<{(~ODU+6hl zTU+Yu{ab54wQTgPj4c19wVw|Dv$enS(b&>j&%x;5`e^T<=iq4n&(=u);)$36^-PTH znMBPTfORWbfc=X=Kmn0<>Jv9E_Z= z#ctkwMbz|zjK`Gfd|1}Gn+?@E+!5AgPj^pX&9L;PlZ=HFF73rxxI*1#G(68*yjl+& zRZl;BFRW`==@m`>`S?!y1vs5WSEG=kV5dMo=C#u4UP=Qy;k^DwFjWJ|jme^oPlZo_ zZFMt=7xaM7g!67=hi16P{27u9cC2pPYB&!W@WyO^wA^wR3Oh6$ppWd= zcbw?{Ck+&g^vs6WKHjWfQuK^bHoxiM}u$D>otZv5rro(PS*Pi(93dt8Gl zcKXGIT48%KJK54W6{yrO1Az+JUi!Jc8Z%*2ZKRRMcvbHk`tn|GX@2)t*H?_)?1(th zZ)(Ji0?f&>fq8h%o3K$*gxE517x6I4gUQj9l`2W2L~T<}avh~gyb>0BC*fd&&bo-> z3;MWM2B}*~#q4#H6hnNt-Yc zr;GN=c50e3V|d>@679LK@K|d$hF&oOo>1epd9m&bJ{uh8-Y(+W1okS?hPnGAHF5}i zt+|wAZK}-wQOXGmSxL}7R|_b)qQ}*x0gJrT6o`A(%Z|Cm_RWRIL*4+K2Q%E9>`Uyb zQ$45UyIN@5MH!R#ZM9jKyQp-H1=VF>fnt%c+;@)QR%O7xKv@3>&q&-KPe`2Sl~-8@ z4Kbf1h)R6syD~(q*limzJSuyh`jc2CQblZDur%i7x<$KW&D$Ud3z=Imh2R^1#-O8D zZCA(6-uK6c-gm=GUeH7D2UnYj4wty<_OaGmT8ub5=xvmc@BB1>23IbOMmNe~uY-VAS%=69b{=haX?K|Ic5^-~>r`i-|%io%R+1c67N zh3dIUBbuqKrDWs}7!bg=i}fs0#iMFmNb9YqNBow3zNayV5T>5@eX--4!cV}q={F4W zIOY3xs)3-W7E%5*t}6?kx-YJAOno}-v2nLDFt(ps7T?l#i%%lqB89`1ONCSVHT17c z_&l4RQ&6E%xxlQBqvMN2;@P(KP%eh%oh#Mpn4KwwZXwA6F$MB)sh>y&i1yY5+_n?D z_{VS&xR(nwl4##HGT3^UhQD2uz{%L@Q z`bwz@4VWeYHDa%Wc>YlTtPPc6d3mYGS7El~Hfo=f?|-a$ggU(Vcub-;*Iv}4-yduz z$ymTiXuJF&10xfW$i#x?CHYs;7c%|tmPnMS&c2zFODZloj0D9{Na&i9=u>=9ij~+% zO|&le0fJeyKCK7GaSvu`zuJy=PkY(91((O{<)+6QK=?7V)>)dlDbwv+NL@u{AKd#l zXz=x)@LB2OaeoMZ52n*atkf|6(N>w(7m3VyDtleK68r zay`S@#ib?#befC%gJL!P4v8=?MKkqGam~IdHPTN+d)>RKyA`o|S2pbRQpE(hJi$f} z4pv~HPdT!c#0eI2p9Mm&sO!ZZMa;J(&g2xA^lLN4KZE*K~L%$ps-=yiK6 zGvfIg^+!K7S%OlT%wyjCcXZp*8+6;BkpovF;I(U*+NeW^qn)ak(>DxRbCJ-e%tmb#1_H=aahfpO~>elS!O2+J@l{f8pb=ZkYN~ z8#|N(SphTaxEJfhC{>6jfSTrw=>-*baynYp=**fFg@YGsK$ikeM%ehu>6_EDJws%< zbkp?o46LlYq&&|y{d99@v;z$3s6U(ef%zUK``uw7ky>~#i zZoJ9Y(oe8I-y7|R)S#^CD_KSty0biE((vVb&*XYe8=hSlUE{?XyP_>wqe=k&WY{5W zVGmy^*-nI~RQ^FCGT(IO-L7nTvgv81G7C7ze*yW%flITZrZOXO*leldj}W z#Vt^|si8r3@EqOc?(sxCIGnWdx!1wanMhpH;yJ&z2Wi`$a9eiQLuk zfmE5CN&_0=gFASV(Yyrt;@MLva<@E{--9Y9)jLM5iuKG`evHh?S?OWN1dj8Ivc9pf z|FlZgRS;xDRUl z_7C1T#%EK95hIv%7nziIDcD!UU4GtmTjkiTBcZA?*LGiE!dZHH0B)ErYF8}_+fNCK zP=m+ZB_KzUe0OJ6{aw>W?tKC3ca=`!=sw4X@Npg#cNj~U}nj5<= zNebER@@NHy`r`ajSj@xhiU>i|s+&-|Q}eWC$gbZjy{7c*u$ z#2j4bm~}Rx6{Tf5{Q~0@6dERRow7{_yd*{V-#*Qj`-2PmY|X(AhON^uj^_($!&;M+ zn!sQkJS^_y%qn$*;9UjILj8T~;(j~7&hfkUkBxyBDNCY4*&z ze5VSpD1npy{!^X^p6GzC^+P*JMLay1r3iJv2jfcjYuIN3PwM`zL+z(7J1wR^%&*OlquD$#UyLHONv#ScUw;@q9) zPZYyqgk6p>kX1O7?88vFgocz}HxL-Nsji^7vgUg&C>vYVG-<#pY46tDW;s>Vj>fE- z-(Q4@!OTyVY;O;b{2)F&RG)V65R?$$jdbSAJ|?(~;hx#&hAiAjrXDz$7CD$_<|2&)TxBLRL;w25B7GMoTd2dyV;{8-9R4<-V?7((1^qrTU9Q3TqOvO zH#gq*THpl5MB&36b3KtyI*5xuUZPy&8^jmiji}Dr_RHk&!+#}h)2#d8XUJXT#-O|# z_@%%@tS6${__YQBq66*gu7F~+Id(0OOL3vtm}9Qii(T>+-8i%|Q^INLg-)d#CHaO0 zt8NVmS+l`Sd$CH@TwkXBa`cEmm1Sb?F6Iwb>IVJaET0Z2s(I)Zi1y709>{{2Ro&Sd z4Yc_Di)Isz3p?S`MQq>F#(5}K?(;tVaiaT<2KC!hhrnHI?!*ul)cBS^qjuG9;F&;hANDmt*TY3g3s2If*}&^Ar3;DD#l zEs_YWT|rmJ7lR^>W@8-et<|3^1tZFbo~Wr$e;(?dbJXBH%#0)B*S^Qj^r1q}GACq) zZAQ{c^cwbmySvovdAg_rfqxzj3Xb4uOwBqg%_}m+N=0W_9A>$)>Tncpi8{JKO~Q6P zD76<5^e_-k!N6g1&Iw;7q1D$slSNlytME1Qq*pi9{!xZu6*@2ql;;M(6zD zNP8cJ;RYp--?)x;^EP$mt8uLOz-EYRl#2-iO}7B6!d!T5PCl>6t%cYHcJ&znOb)L8iRi0{!r)v{#s+5#qjuWu3g54LfvbmY?3Vlq)47teZbWA?Ao2l||iPMzd z;oVvimvPLLGKWG`&*rCjKx>p!HA(=41Rl6gVYmqoV|X6>>n8?^&(kczY!keA;LOT zmBM!LRnB_&9)&tB!8TQAuXl_0gr)X8VsG&ht)33xzYz6}}!^_euOsRvR7-lQ){w45evO* zl9-u-}>Z{)Q~k!#VD9u>D9R2GIByLjf|dEzK;1@!3cJd%@9 zU9PqcpKmFRMQMy$!CS{BP-w2v3@EERi{3)$74^3dJI@(@*OjlWTB0lFDIn!KUfe)Oz#+V#KOB@ zD=ua%HRI(G)rvC>aft&lhClNMy%?%mrD(oOjyVTi1P+iXFHlTu zarMhF%73MMb$vGFVe}arjZ=l)WKtg!LKyr^XnRK`V}E5dU0qe1xaZ`3@MDU4qhtDoT z5z9)hCyte+>-hNBl-c($w;Rj2oXtO&d~k{?wAXG+=wEIhk3uSeLyhA_WwY(|=0SBM zCAyOvLX{QJ0qwmeu8^UqmI^9Lh9?EKN%+!tb!`(pAc$p_FiSCm-1RV_Z&wlnqVysM zVt{f3CngAv8MYp{w`e)^u5&Mg`@lldu6%w&)_n(6dT)c5HnyBW&dIWr35Ah&gYHKr zHOFd8E$Oe^<#^4K5>awK{`kmR{Pp9Iauq*%J^lBgqT|MN662DS@Pe_C_1<+1yB&;^ z9pa+d*(_w2{GCx&6{w5B^Z|tQH2DrPb#G9xXuG@k%EQ_7!FKp6Pa(@z<=URg#ww*X z?EqD6HS1=jBBNeQ<$`^4h?333#dQ3w>3Cj{G3ntG29|v-3)xdSjmgv(*hQDf+j;Ni zd-o)52hA`M_cp8UdRpoLg7ji{VsUSfFF8qgx(h zQu)WaN{reqddcI`{0CSy-QYPcmzM{V;j=|4qem@t_4lMdgQ~VE)-sYO0Kl%~KLu5f zQ5V48$iczP%H%(5xBHqJ_MloEFQFES_1X7T8t(}qGRD;3rK$tatJ$gzn7I?V2n`3+ zCF8NE({);Ks_m=d(7wFa$lF3fuJ>3l=U8BPy?(oN2_yKC0`EFLRn0sjp%0q^!_jj! zP0dn9=t1@Rc2#I;+j4_%YamCSgseS^5?p7B^E~8$idRD|Lrwqf5N-I~R(LBw++>~y zL{2ehWul;wku$*gGCo~xBQ@A$GJmhs>NttDBIAcFG!GBJO}Oxa^LEs<3u z(!dy?PH&m&#vGlHr{cA7dHNSgkX>0-a1o)V$I>?|PreHtl&=vaz|frV&1aAK_BLp( z&5f?%M&OX`nDRTI6|2%zeMa>}g_h2{`{~)5^q7mB|@{2hA7u6fhT%c!$H30NmUj;G=%22iMvp3m3aJ^QE8u@9o(o>_28!BL2;06d& zjpCpQ9E^Q4rW}Z6sZzH^y}3E#5+1M#DK%yE+<6^+D;TzOt0;z2YcoAgfh+ixA#~dU z`;<73&;X1QjyYEIfTee8q?_`dT2=s*7KM%X0=W+7F0-|XmLm|x5mix~$$VU$wl2`q zL@&#|xb9&wGbvcEFOwq}EJm$mG8=5d*3}%Ajjc~D=QJ$B25P|lIKu+--C}^d2nsbj zN%R|E3t#PTED|RV8`0jjke)KVL~ho(@Yt&FnZ7{L7U~VT3+g%*?x$jSc4JJ7*MMf% zhf$IwK@BY9mVY0)V9CnsYr<~@#fPh7FeYoF9XzEXj_7ePKIEmAa3dQe()f{rvx9w`5|g(8_N)R?o94<6JvVI9Ty!QIpvoZqsYi~s0^~3z zcdQ7m@1zuU&p(<&Wrk1~gs@zekt9di;60sFx;oqKY~C3}idjIX01G{ATWDcbuxnkX zS?lUI(I%qM<)DVwqNFvACog=QGeryxV&Hy$y71%;L&dOsj)div+i3Is4cpQ4x0JjP z39~s$`KY%*0cbFNTKV_G`cI!UV?<&UEABGNZYXxcoxiT9WRb<5SB1WW3VgfZHn@RH z!qoAsoz3*p?aiYYrWwmJd^_^#))?AYvW^sC9qw{BR+zz5b~v$}m;VmcnmAD=&x@#* zVbTVcB&>l|>wD1m1wZenAEvMJo~Aw|PaVdm7Z)#|ht#IX9M>4T4JT{EW%{nnFA7=! z2D(oULi;m~wdGng9 zp_8&@+SlpoUokbfH5@yg6&PWi^;9WXoIg?^g_sB}>a>4W9&3rLyiD24N@(2bSa|~? z{;K-afsz@J`D7LmOOOr*C^sMIZu+W~UHEw=(n-^%nE(KN#7TH5dLJoUd(x;ubBoDMpfHlnI#Uo8(b)CbOVA;EOQP%idbhkdkF=_N0{0&Cc20tSto#l@tWnSH2pQ z+H-P1(9Y-*R+Hf5><)?m`ud8Ke3~a_OPxw-#h`8}3`(vhCNOvZ*rLN5HhWTR04G+N z!s&LajBO^G+pF-tB3!}~2aCF?&Y^LimLb|Z@|*d~bUV@ctjq5+&kNX?8~1b5+og%o z$1HYvyxcvX%D0G?u4$W4WZ7cRA|UmDAG~4f z%}B}&uYuW9RFR*AP_`JomX@XIzJHDV>z@F21)zrXAT#yGzywWDj+~Ws{A|yJC90|M z;P$-1*PNyP7R?nYv|SpRnneb; zJddGrGve&f5^#U;u-cW=l#3X)lJGESPgmJhMO$Q`fY& zNvC>dsltCHO2`xExFvs-gjE@x{B0@-$~htQ5Kakxm}M@0OM-*XdTIYAudd7dy3>^P z@lDh>4I&V;a-ZN^rd|w|qhlcI5eqnJO?#<`*$Bh0qQJF)M=4hv{Z!-?=E9~mu&Cd9 z_;Zw!2uYVsNTDlmxX}}E61SXC}g2pe(kRP7QIhu)vdT9_;~g^ zrnK{MJ+ic@%R_P(gj^0$Z*Wft&^965$cy|Mas5K~!r?wW!G^d`gS*99%EiT(&+@MR(&`(aNU0-DMv5luy3RKPWw;5SC zqK|Pc4f#6G_E8bvu|8GN3%L%XTbB$6d85Muip_SyH=gEPEXGwm z7dOR~eUo|iL|l&mwC$OtLrm_ibJcw4pU#bU=)|{Xgg~KXy z=t_MX<|wkE7mLi4w~SF{vQW~E1J(gobk#74M*W%cvNrL9*#Qo28gEkyTqOc*QUf6{ zQtD{H2rWAEkm%*wRuDxAwZ6lZ6{g}L^rlxW_U?Ssr4yCzx&#%sq%S{5KRt?P|oNJ~#wTT@?0^C-A@23#}&uAJ;^ zx^8Xg1b4P~^@Dqd`Z_y?`Z@*&2f7AEhguhghbM+6X8LAkCt3$b2f8MPdS`~gBkhYL zeLrSK!E;lCOEbNbljEb43-i-sOEVL5^Yguv8-268W1Y*BeXG->8{@O9;|n`8V;eJ* zTQf^*^Rqi0%Rhz=rsvldC)U>HS2mW`wr4iZ7k7^5Pa&JF-Rm9w8~x*u;U62bU299j zkkJXq`26bZBoqvW_Vt}D_CThW*Jf5$R_6CtC$`s?j@QSIHy2N~7w)&mq34V1>+73q zyO15o+V|b0Q@7`Um+??$}p?k*{cSkp;=l9Tu^Rw%->xbL3hlhv9feM8}_pwP7006{UsW&3Z zF0=b{*Vb{4B(1iMN8nrG)sSqw;HM#(F3d*96kVtWN2^<3;J--Iy=aZM{dNa{0a>9u zML^ik#^39 z<*-WXDnjie3rGU6!WhER!UDzsUjYC81^kx?e}JQX5LG-*>4R6?Rsb*|qyVUe17Hd@ ziDf_N!^SiDl;r!pFSv!}u7oO@+%_~L-SRPcal%OBwqE2{KQ6^9^G;5t9p;TCmCPj* z?d9QZx9>LIAsC3IDrijW#ly>u!KP6k&ryJn}0q(arUDkG0nMgM>sz^~z;_ zcb{@N<~(Ph+Db8&PdT8J-NR5DI$VSAM}fASE;Vy7q$O`Iv|8a)`9!fjrPWg>0LF!{ z_BCLD4y6^I78T$~?Gx++3$PbJrL_iB0BGp}a(VzcKs=of1E1e?BB?DbJDg%RfcI^e zA35m-)Qk-95^=disVs9pd=WFiP^jIuyK%$OeuI-!;8qzjU!QyKSaGoR@S_{9sOZ?G zJm+PS`art(_4A5Q$3N7(iIEokU_bJbfEFZmLFNM)`RAqjM zKP|Y$BvZP&4Rcm*DFXo?VpT{lURTu~Qo@sQx;o#McG5JZ(apm(Cb%On5h*x(kFnJt zxiFk%jXdvP6*9!Hci%vA_t^q`VJ%-N-|3|Ey3cU;DW<$No*K|}VP=NuGr)}I->Yc$ ztm5F%A*n>7)dFm1doKyF^U{bQim-mM%k)gGBb5SRP8z19H>BRYIq0jLHySMC$jV)Z zGN0EPL<$}6inK&t=d=@kBJ=TQ!#8fpb=LV_H0V(fVZvl?LAt9o;1#yXB>SBIs<%6j zD$+5u1R^DEr`&qRDh0?b~R#)cavGnQ!Ea^93Aw*{w)1S?BQ^G zIpy*MhQtf=sC!_q7n2o$D-I|-q>)|J!hZ1gE~Beu{oFFLd6vsc164c}ZTEci79^D7 z0_o~w_Sshvd98Y9woJ?g-y1l+&%^EH*eM}^i4#13tpq=!1l`Zg!wi6VUF$d>dXu^3 z4#USZ)8Kk?pne;LpVpMSMUOz#1K|A(-?C6y15Igdhgmv0x<8+`D*VA*=s8{5`hqMJ zP<(UN%u)jlHh~HBUTR@5lSByPU2NQLQoF!ipf(4yziVQH!2xYgBwH?L7!x_@Rre~q0109os>G_!i^ zO`4&HNf>HVH?yGW&T*u4V8U3;U*|L+{kzHQe>unf*6e>jEB>Yd`!8nFf29NX{{{T- zAK+s=_5a`u(a1e&x67~(<~Ju#z@tcs%fBfW)%E-P?cisRt>na&MHr;y-!cL9tjvs! z?EkYdTofl~-ocC&c*zquy77a99Vb5^PrdC2HrUvG-NKUAv!{G2}KtJ;$| zs&%s7!W>NDrs+-?qic6Uw^`=SpdRu*)Soj-R(g>h2`3L1m_vrIsQri?$ zUh&~&IsO!tM&mCQ@|3qJ#Cs=Cw6S;?)vk$(pE~_yMwCdz+0Z^hHGDs~bW-WXQ&&zd zk)iWW!KG6F!gP!U($HJ#K+X_;QrFCtNMv3PAA(yIBZdc$&Oywdu{DY2_cW@<*t+vE z5>}LffyD*-IB}$LQf98h&(f%(@0N^J({Fj717XOU& zd#?E3$|63H3zd-rL zHUE2*Ki*T?U!eS+d;a%0KiTKMWb!X?{x2^2--G>e0O34lZGV11f8?hB7t(LUk>68F ze&&9^MD`Ks7gznaA^e-(?{`gp5>9?e8O9&zCx2G_{c6R}O_g7Q_}JCI-(vZ*=I?Xd zpQ{7w(*tMlcaMuvr-7O3ZF2UVBxLXF7AMSnU z<(%`9bKhI*ubI83_MTl|_1@j9x~uw=mwx;N2L=WK28R5dj!Nod=5_`c7?_9S{t}FZ ziG_jPCu;*8Yin~8Jsmp}D@zs!OMPZ59iR!2*~;3$Qr}9?-on7rj@igo$J*FL4=Dc^ zzQ!87R-&+EHVQFn;ZEt<=+5R8w@PA=v zXJuustMh;L_F!eLV`*UifAsdyz<>7kt2P>%Tj|&t{9oG$w9~P(2mZ4+(qFt06AK+9 z10ajAiJgUxHSixE@K+sZZEIy@YXJO{TLc7ze~qPkPya1Q_Zradleqzq*~!9uUZX#3 z7L2=aMu(z3m!WA)d12J)zyXY$UCM!Dmt^bKw8I_3vN#dPf(s%U)E{@lvltdraRUjw z4sMhg)=INdAh`{!pi({M9o46Pjdes6wc)zqzlzB<*jOhWy})D$mp*ME$d7#aDoKo! zdiuEH?xy~rLGmuKFqJ9dEqSskB(0QCvKZ*yaTlAmp)|p7u(a;EXI=w`$6sM@+=u9VY~@6 zv62T^QEp|UmfVSz{qnK|vbpcI-=UfjsW!UyV|C+72*|R^D4#E@ZW1ow0LPRBmh8o% z(j4{}6Xq9)7LQ7jy(ag1Z5MRC$_K4w32L2KtF~TXA0lbn(gaVl?k~9EtB`>;9iDDF zOnN?0wKAQ@A`B%U$M%m~jI)h#m8x74Zj ziB)4oLex^b=oh782VE&h)!`fJIlpy|+**d$LFWZRSAiZ(0mr2~Dh3&bCMtI@3sOlE zA*;!HiZ&`T(xXrFgte`m&Y!W@E)Nhe!yq!_wO9hdZuC*Plv|9oOBUZ0Xep9g9xo8{ z#Z;fcC8(-ZTk#Tl>D=`cT_V#fU&95J;jPfpm89gy=qI{t6NonK3K~5LWW|`CWJRDl z=yj-NkZ+(G@TCdDQJTXe%EgUKI(&0J$Ap#qobY@P*hEfVD@EySrJy|a=IDLQ=yyDI z*Mf2-Zt?dq$x@tbs~OSe&FA>7kes9%3PU~;kt9cBD!;tQ4lIFe?3?rYrrYx~!P^b1 zrn@u2ySe&KHr3qFvav%4m`z3Y+cQ!R?@!vnbE<^4B_X&A(cPOo1_<*dVTdY&A8~P! z@q+@tslB?$!np{eL=3wskUa3{m>{GuoNYgqUj619^mbGQ`65%299>PA(u3aZBUdj{ zD;$OnhU=bPL2jBkVkNo{K8yWmQUyM@nfJzaf?7l<*7ql(K*T!v>So=1tOS+vHwpai zslmfjwptdAV%>oFFXvZXsOSKd$B%0AJsT&V9>BL;S#{v6K|kYs^4@}3HoL9M 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 diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index 603478e5..73f56b4d 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -90,7 +90,7 @@ public: SAFE_CLEAR(inst); } - virtual bool Init(int w,int h) + virtual bool Init(uint w,uint h) { logger::InitLogger(OS_TEXT("VulkanTest")); @@ -159,7 +159,7 @@ public: return(true); } - virtual void Resize(int w,int h) + virtual void Resize(uint w,uint h) { vp_info.Set(w,h); ubo_vp_info->Write(&vp_info); @@ -494,7 +494,7 @@ public: SAFE_CLEAR(camera); } - virtual bool Init(int w,int h) override + virtual bool Init(uint w,uint h) override { if(!VulkanApplicationFramework::Init(w,h)) return(false); @@ -526,7 +526,7 @@ public: db->global_descriptor.AddUBO(mtl::SBS_CameraInfo.name,ubo_camera_info); } - void Resize(int w,int h)override + void Resize(uint w,uint h)override { vp_info.Set(w,h); @@ -580,7 +580,7 @@ public: SAFE_CLEAR(render_list); } - virtual bool Init(int width,int height) override + virtual bool Init(uint width,uint height) override { if(!CameraAppFramework::Init(width,height)) return(false); @@ -595,7 +595,7 @@ public: VulkanApplicationFramework::BuildCommandBuffer(index,render_list); } - virtual void Resize(int w,int h) override + virtual void Resize(uint w,uint h) override { CameraAppFramework::Resize(w,h); diff --git a/src/SceneGraph/Vulkan/Debug/VKDebugOut.cpp b/src/SceneGraph/Vulkan/Debug/VKDebugOut.cpp index 86b43b90..742de644 100644 --- a/src/SceneGraph/Vulkan/Debug/VKDebugOut.cpp +++ b/src/SceneGraph/Vulkan/Debug/VKDebugOut.cpp @@ -62,6 +62,7 @@ namespace VkResult CreateDebugUtilsMessengerEXT(VkInstance instance,const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo,const VkAllocationCallbacks *pAllocator,VkDebugUtilsMessengerEXT *pDebugMessenger) { auto func=(PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkCreateDebugUtilsMessengerEXT"); + if(func) { return func(instance,pCreateInfo,pAllocator,pDebugMessenger); @@ -75,6 +76,7 @@ namespace void DestroyDebugUtilsMessengerEXT(VkInstance instance,VkDebugUtilsMessengerEXT debugMessenger,const VkAllocationCallbacks *pAllocator) { auto func=(PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkDestroyDebugUtilsMessengerEXT"); + if(func) { func(instance,debugMessenger,pAllocator); @@ -85,10 +87,8 @@ namespace VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) { - if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) - std::cerr<<"[ERROR] "; else - if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) - std::cerr<<"[WARNING] "; else + if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) std::cerr<<"[ERROR] "; else + if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) std::cerr<<"[WARNING] "; else if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) std::cerr<<"[INFO] "; else if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) std::cerr<<"[VERBOSE] "; else std::cerr<<"[Validation layer] "; @@ -147,10 +147,8 @@ namespace { const char *obj_type_name=GetVkDebugReportObjectTypename(objType); - if(msgFlags&VK_DEBUG_REPORT_ERROR_BIT_EXT) - std::cerr<<"[ERROR:"; else - if(msgFlags&VK_DEBUG_REPORT_WARNING_BIT_EXT) - std::cerr<<"[WARNING:"; else + if(msgFlags&VK_DEBUG_REPORT_ERROR_BIT_EXT) std::cerr<<"[ERROR:"; else + if(msgFlags&VK_DEBUG_REPORT_WARNING_BIT_EXT) std::cerr<<"[WARNING:"; else if(msgFlags&VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT)std::cerr<<"[PERFORMANCE WARNING:"; else if(msgFlags&VK_DEBUG_REPORT_INFORMATION_BIT_EXT) std::cerr<<"[INFO:"; else if(msgFlags&VK_DEBUG_REPORT_DEBUG_BIT_EXT) std::cerr<<"[DEBUG:";