From f02685c6b35a0647732acbae6b7945115c1a7f6a Mon Sep 17 00:00:00 2001
From: matthew <matthew@sleepy.day>
Date: Sun, 20 Jul 2025 10:36:07 +1000
Subject: [PATCH] fixed bug causing material buffers to not be written
 correctly

---
 assets/shaders/convert.comp.spv  | Bin 0 -> 4280 bytes
 assets/shaders/gradient.comp.spv | Bin 2944 -> 3408 bytes
 assets/shaders/gui.frag.spv      | Bin 1716 -> 2180 bytes
 assets/shaders/gui.vert.spv      | Bin 4188 -> 4652 bytes
 assets/shaders/pbr.frag.spv      | Bin 1624 -> 2088 bytes
 assets/shaders/pbr.vert.spv      | Bin 2176 -> 3756 bytes
 assets/shaders/triangle.frag.spv | Bin 1680 -> 2144 bytes
 assets/shaders/triangle.vert.spv | Bin 2572 -> 3036 bytes
 src/gears/renderer.d             |  45 ++++++++++++++++----------
 src/gears/vulkan.d               |  53 ++++++++++++++++++++++++-------
 src/gears/vulkan_logging.d       |  16 +++++++---
 src/shaders/convert.comp.glsl    |  18 +++++++----
 src/shaders/structures.layout    |  10 ++++--
 src/shared/util.d                |  14 +++-----
 14 files changed, 106 insertions(+), 50 deletions(-)
 create mode 100644 assets/shaders/convert.comp.spv

diff --git a/assets/shaders/convert.comp.spv b/assets/shaders/convert.comp.spv
new file mode 100644
index 0000000000000000000000000000000000000000..eef316d969182453a571476d54196d6c0d6b03a2
GIT binary patch
literal 4280
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
X`39oD)#W$g+bDnEC$as%uo3w`<Y01t

literal 0
HcmV?d00001

diff --git a/assets/shaders/gradient.comp.spv b/assets/shaders/gradient.comp.spv
index 8a334e2389a1de3748e8df00123090c4a0becc16..d29c57bce65a2731355f86dc3424f9cca2affc7f 100644
GIT binary patch
delta 545
zcmZn=zaX{2jH#ZLA%Ot`5_6L>Q}ap~*cc#Uj6mU(%(S%9;#8m*8(19^P^`EhHMuk=
zu?VD#je#93&J1KH<|L)2<j0q!R+N+$r6S~5KynbX;gW0&9AJH{^*~9OfpA%{!4L&(
z2!k^cixDbd2CyR;j;w%<ffH;22eSFd3cz--F$gCB8Jr+R8JT&Rd8x(43=EUKnY0C2
z8B&0vAds6_5}%pEu(_K_m$BXhDR7j5k^(>s69WYfNK64qj2S9sfFuSA5Rf_(Br#T~
zm<5s;$nPL^HV82zV0c3W9T0-Ru!M-YAc=we1k&uWc`NflCUqW$1RzHT33CD27<h6e
Nn>{1f=ACTESpZBNRu%vN

delta 84
zcmca0)gZpXj7gM@A%Ot`3UU&YQ#0~&Qc{a1yEAJ8Wl}I@Ha9ctGEV-$%(6Lybr%ye
SGeg2;PY!!V;mw^K$5{YysTJ!0

diff --git a/assets/shaders/gui.frag.spv b/assets/shaders/gui.frag.spv
index 3b9e09fdd1aa2f62302f3fc43cb5b4d21a08988d..8a577ba5f31212d565d18801d4d4b6292f414b49 100644
GIT binary patch
delta 544
zcmZXQu}T9$5QgVA?j`{R4-1Pl2MQuKK~kg;Okt7M$}()c4OvLekiCO+*W?ZE5yW0d
zUc@(YX4lIOxG*q$|3Clk&hcWOehX1c$RHfOo?BCtpdhdWac&oj${A$J`vfw#G4It%
zZ)r+F*YghcdNnus$E-BFvf7%coskx@PojdJpOZC;ZQx1u!NH(n@KU?zXal+|oEsGM
z{RKUq&kg<#1y>n1eKIX=VGH9NKyxh~QVF+6>8y1*vpF2z#A{Md*>Y}Byu@l5Er(df
z7%hg_kTF^au@PhPkBu3lzmxANvPax^fRhMumw~-7Mt`E=>EWw$FYeC$t7y2b0rvl@
M`H|1bph?x|FAT&^`Tzg`

delta 69
zcmZn>+`_woiAj`=L4g4R3UU&YQ#0~&Qc{a13o~movoWYl?qw9;9K!6wIQalG%jO7H
VB_?KO28GEB+3gwGCO>3f3;-YP5Uc<I

diff --git a/assets/shaders/gui.vert.spv b/assets/shaders/gui.vert.spv
index 96f037c9359486e11fa3f4cebbd0ea77014c972c..7eb8f37d47a44a7df51ca447dcc09f0ba6fca289 100644
GIT binary patch
delta 545
zcmcbkutsHr5pz8&Lk|N4B<3b%rskC}urWZy7=gkmnQ3XI#i>9sHn2J-pjdH1YI12#
zVi8Ce8v{F7oEgYY%t=a3$&W8dttcriN=3-AfaD-%!zI}mIKcW?>w%Im1L3k@gCPpo
z5C&%?79&)^3}8nx99aPy11H!54rKF@6@cwvV-N=Uo)e@fBQq~EFSWRsfnl;cv$h~B
z!vvrx2;?S~#Al{3Y;I?M$yo1!6gbL2NdX{+iGczKB&L8Q1_~IEm;sU)C_q4BCP-qe
zP%#T6F_7Ou>TD2VM!@if2s$7Hfnf;|b3qaV`3a=iV{<NRCyP1{I5eVw0x%5Hgn=jj
O<g{nx*lfwA%mx5>ty&cT

delta 66
zcmZ3Zaz|l<5wj>8Lk|N46yzi(r)K2mq@)&2c4pCLW@DHzc`uXr<`$MGjGJZH+gO;H
S8G0t4<hEyI+sw(M%mx5h%@LCT

diff --git a/assets/shaders/pbr.frag.spv b/assets/shaders/pbr.frag.spv
index 50f14035334c366ec9d811a65a8d35691cc3265e..3b228d4012627e2f145c70d4c161638813b4413d 100644
GIT binary patch
delta 544
zcmcb?vqE6QH^zEa1_cHPNX$*jOwB7{U}J!YF#?5CGSkvZi&KGOY+!XvK(XS2)a25f
z#3GO`HU@UEI5Uu)n3I&6k{@4^T2WG3l!}mJ0m(tkhD)+BaDer()&nJB2Et{*2169E
zAq>t)EJmn+8NiNYII;pZ22QXA9LVM)D*)TU#vrT!WN?BMWn|`M=A{-FGcZi%X3`d9
zWl#Z%f<SI!NqlAs!)9+LTgG}1q`*-IN(ulmObiq_ATb3bF;KvO#0-$cKmh_0GeHt#
zg^F1qiGlnMQfGq@GXjP;M9={t2n<Vzm<y5^$WI{69-CX4d70FCz^(#mhGA(S8v{?C
N%4*LjJ^3nYGXQGVP%;1j

delta 55
zcmZ1>aD!*VH%4YQ28GFujG~jdm^FZG6(C!Dvj?*U<KzX*ESoJ@*_fD_fhtnj?HSo7
IFJ*5A0FAs2P5=M^

diff --git a/assets/shaders/pbr.vert.spv b/assets/shaders/pbr.vert.spv
index 4733175f136947239f1ad605dec8290afe71b7b4..8177cce15065f6244c44af2db5a16d5da7f85584 100644
GIT binary patch
literal 3756
zcmZveS#ujj5XaZn;UvyM$mLu{#v}w{%;lIs;w!dM0#0m@<Ct^3lGgE7tyf~T3WTS8
z1ilBazymz+1^7N3RaEi+&F;ukDJIqK?tdRM-P<!tX?SwPs}6ai-Z3xq@^#W1_J$<F
ze?Fb_Ukd(f!G9AU^{U3NzSdZq?q%)inHz7B;kZ{aiO6xnlcQEyv>!wX@)6OP=#uD)
z=$dF&^ns`@x-a@%^p$8w6o{Ilwy30k!{UD^dD%PU)z|#h?M*-FB>g1X?WFtuH~k=v
zcB3$r{RsB@`g(nB)o*pXelL3(hkhI-q2G?uu$4tmRCJN2@QadG+;6)M6?wSluXq(x
z!&84h$kOOL9Y;vjJ1hP;_BX<GD@?P{;MD@h2V18XWl<*)I%53kk-?)RYee6hPhf4-
zDcf=!byuQZ79_235J!ix_2YP8tEe~hmBpFqZ<P4mP7l4}y)6BHkcDX!#Q0PT3^~|u
zMq!c-FwWJEc6a+d_N<y%&eQ9Lt$rM&#Bfe>a+V-&hV728s<VEoDy)sZ6}bn-s=ga>
z6_L$1FbcEwDzSOqy`XpCVeKQ>^K<*IL)ANM@*i^ZyAEcLyr#qW>_v%2qNg^QK3x&F
zeX`h9VauI_uaJS!J1~}}z>hSX^q*PYSVk_JneOy6ztxFNUgmo<ZxAVjRn5FNg8gnB
zrVqj(4SQK0%N@|S>pv;{w#Dmlry0Z#^Ep?Bs`db9DbnoEz2Od#`wQ{LUeFFxHzvnr
z^15-*3imp(984_tts!DocEnfG;M;rq!DEIJjC-gvCAwv1fT*#VW0WY5vbm$w%)#sG
z2X}(GxhpF&YcyvAj9CMNTR&pJm@SJTgE3Qe{bjz#MJ)DWrtDtGtjV029ANAL_JWAK
zHU_NbVC)6PgJ%8M7i`ACm|?J+4#wPq-F7f$6>QPLm`|`32V)+=?uw|9S)35DtZvUt
z&CKAih%?%GB%XzRO8h51!N_kqGIiy6KBotLESq=O-IKXxPkKk5xj}5nTX5t>M_zK|
zWk;q~yDxLfJ|z*gp|cMQojbs}sE>V_O<T*BBR_Iv?t|@zy&DJpD4X9Ew>Iv}!JZ{^
zXKXz8hvmj|M~EL1aYpom__DVn9XmO&qr3J%IyKq&W}%nF@ozi!Q_4b~3Du4r`K%=7
zt0p=pf949E*&NefW(o|wroYS+cJNz;&hIbSb?NZ@K0aHp`cYx5DP<zpF%drCmaOk_
zVV?Kwck6qi@Bz2J*2bN)n9XNxCmkC;*s*c$7e$<b+~mObjLv>aye49C9(4Y<L2oZf
zKO;_kVB?Z_e{8?7LG<XHIQ_*=kI=^ojD5~au8GLYKIj)jEaESUV<R{5=)6r}*lXhC
z$3CtOFb~L<IQRb%XTPk-NpWJx^@=!i0LEVEyb)mI^1Uja_oeK;Dw*#OhA;ZH0wdRJ
zg^a(g>kY~5i+x(0yx31mdRyG~`5nnD^47#>Mbvm+JH97Qjv<k|tWHh5m-w;I`-Kx2
z`OtZDSoU1=lF5(%9SmB;U(mT$#lb%W)Iui@dL2OPqN4AK6T`jvSe!FbAF*rVLn3fu
z(RqKs>=`x-9sh@tiRBy8citLev3(|v4UAmqyfa|<@~*HqzF!tN7{2JdDfrUMuf_4@
z9PYvnk;5+x_>u#Cr@+ve$3R35t2Yas_?BdPYimbu7uc+RSJ;R5goWQ<LMr0((s)a_
zpL6n{7neoMK00@ow+^2l6oLIE5kBBc!fN6ZqA?M7ik#^9VP{5P7csZk$(zq>jyDQ@
zO1A5wC3TCr<+qM|0nSX@IDYrA{ixi`^SdH2=J`+UeM6k}kMd%h5p9U58QGrcmgMKp
zbXyp>J=2_IFngv2$(#v%-tfGZMakG~+>&H4_PQg!EaE<ZQwKA=A_7Ne-tUT-^)1CP
z=O2mi0mp}L`#{7@Z|h6&E!IW&f%A=zis(Og8Qb4N=?Asb16%tilAo{rQ(@q?hK6J?
gYUi$OiKrc%d&HSI!y^$kyDz%CFZ=(i$-OE14?E37m;e9(

literal 2176
zcmY+FX-^bE5QZD}Kt(`AJP{Z1M)3k;Vl**8Mw3-c7LDH~<L(HP3^VKOtk-Y!2l>Us
z_vxO-u{X8V?^{QAR~2kya&^kIC(N{&F`LG%c{6Dyw4F9>tAlQ@yFMxh>l>R7@R&6X
z>xj>sS+M)2z7L}$1I$R~C5w`?l1q|h$%^Ef<d)>F<i3Q2k0cwChCY+hzm&LXj+vkv
z?tI(}vpgGT$>+Q{48M${H2Ivwh3qG=2fMpLcPH!*hvBIFk;Y+~WN|o1inw1UU*n@Z
zm0yze)A6A0&{C%Q-CKI|wC=E<hVSCyLtK>ccR{g^XOAr(C1sLlVyCP>wXl4WmA&Mr
zPA10Lc#~{fX)@eSMrD-s<0BiD#5PXTBU?*#poT2&M=g^q9Ofg3scSwi!+xGxJ2jRa
zDBLy|go8By6s7N7-4xeW9(Yy}kL1^|eF=n#S(5G@M1#1f$2gvtVH)-0gFKakjisMG
zNlPF4x?M!yULQvLJe+*=xfdM{)3|sWM>?@|zVv=C{$7r`g!OHi+tP2MGA@!xFL1Sn
zWBq?_%g&AWB?0H(litcRDqF(QD>&Bw@eMn3@3veVv!}Xcnk;)TwPqH@jlW8RnM-O7
z5vXR&2K{^`D|?pLo?{l^(4Hd(j(&TNJsk5F=$k%MR~DE)*D-wt6USZXr@xEu?W#By
z@%-J<8<xjc9klWE+{d$L)#Evfc-}!g_+Na}+OU%YJNvqw8Gv*5ZQ7Zr+nELIEaJh~
zCoFE*xga<7^7Bx?AOAz@@nGVKp+3xjkN5LXkEj2<$(`qV4|egc_ujrB7Jfx}c@O)u
z+O?%Sl5@KMlr)%rF6#T3bVtHktMGB{Id4h$gf#we%i1vuJ_k0WBfpc<oQeHeg=Z>`
zb7r;gNXW}M;5iA4_*2r@$W1($S%bsAAWeR62Qzzc-k;gSpLd>@=HAp`SzgQ@9Jwx5
zJRGrL=Fs~xXRc;VbGhQ-@CEz&Ur<%9RKA>BU*tkKuTvTDB?ow=;x5YTs`mJ;RvZ{V
zF!Ractn1R;YXYLSJf>ea#N$W5$a%B!gC{4L8D>!zW|o}9-jN3T*fs5W13a-{<`<4w
z=9O5^S(hdb4qq_8op50K$t-hM{2x|(dV(Fy|21!atUbN;cCh>XHRg%_*0=*R%);-t
sn3nW&vCPP63G?$(EVFV(!aOo_FBAdB$NQhtp83JXT!H`SHcusg0hNriSpWb4

diff --git a/assets/shaders/triangle.frag.spv b/assets/shaders/triangle.frag.spv
index e179e7034060ccc79b9c0cb5af03f916f72e0559..c4a1dcfa261318ef6f421849c28305ff6d1e3a9e 100644
GIT binary patch
delta 544
zcmZXQ!D<3A5Qb-06P31L=~++&1xuln9(pL$Ll1%vA<>N(&}}ih(A&O3Vd;AmJoY)f
z`xHGplelKUz(Dx^fBumF`{vO8{f`O(1Mo*}=0>L(NboE|oS5Y@w;Gvrz8IPP)Qfzr
zwzMUo;dl-2YCYG<$1KxdS-#altCQxl&!U8;+Y<$fRp425!QLQ4@JiX>r~(=+oEs#x
z+yhOX&kgPk33v4S7MWHiHL121puCFjZv~8y(%GnNW)j#<<A<o2uyXn+ws9&(<q+#K
zM#T_&WQ+<S_RN?#u@}bZ@8o+8><Rn!a2z0Z>DfDD^e0-L?DASC9$vdPXt|mm-Y=&7
L5pPki+>5^>$FWfJ

delta 55
zcmaDLFoAc&H%4YQ2DQnJjG~jdm^FZGEg)Nbvj?*V<Kzj<ESoi0#h93xfhtnj?HSo7
IFJ<2i0E$ixX#fBK

diff --git a/assets/shaders/triangle.vert.spv b/assets/shaders/triangle.vert.spv
index b7669bd0b2de3f7d7fa171a85635481ea1ea089b..dff15cf1431a4478c58b60ce57d76ccde33d127c 100644
GIT binary patch
delta 545
zcmZXQ%}N6?6ov2nr5Wg=qTospT)1!}MbL$y3z5>7D5;auKsznX40Jc^g1h2th%k@f
zGr03%dT-)17Ytko-#Pb$ocFWe^RLgi$>0_IQOl{(Wd#B}ix3xPHmj{hCY&!uX4m?y
zUZ@Ri3FtYV;9V`Ix>!vry{+nv4q8f@&pwI*q}$6H6uZEq>VmyNgy6Zd!O;cuSU5Kb
z$lU{y=W~O5L%=EhJ}1-Ml%~|y0_?xzo0AO2Na-w9H8BOWNwSNY5i92k#Q{#os2pOK
zj8QSfZW*IOh}|)k{jmqe=<nov3~Y#fd-xn6cInv*WArCl9<{qPPp|u~jSB?b(9*xz
Nf5@juwm<SdIsiAIQ&<21

delta 80
zcmca3-XpSM9g`><gBt?`6yzi(r)K2mq@)&2-p{NJl<~rp+5DTilX0^J8ygEVGlSdY
OR4#i)w#`eq%ozblycDDW

diff --git a/src/gears/renderer.d b/src/gears/renderer.d
index 3df9a51..5cf0baf 100644
--- a/src/gears/renderer.d
+++ b/src/gears/renderer.d
@@ -114,20 +114,31 @@ struct ShaderUniforms
 	f32 placeholder;
 }
 
-struct Material
+extern(C) struct Material
 {
+	Vec4 ambient;
+	Vec4 diffuse;
+	Vec4 specular;
 	u32 albedo_texture;
 	u32 ambient_texture;
 	u32 specular_texture;
 	b32 albedo_has_texture;
 	b32 ambient_has_texture;
 	b32 specular_has_texture;
-	Vec4 ambient;
-	Vec4 diffuse;
-	Vec4 specular;
 	f32 shininess = 0.0;
 }
 
+static assert(Material.ambient.offsetof == 0, "ambient offset incorrect");
+static assert(Material.diffuse.offsetof == 16, "ambient offset incorrect");
+static assert(Material.specular.offsetof == 32, "ambient offset incorrect");
+static assert(Material.albedo_texture.offsetof == 48, "ambient offset incorrect");
+static assert(Material.ambient_texture.offsetof == 52, "ambient offset incorrect");
+static assert(Material.specular_texture.offsetof == 56, "ambient offset incorrect");
+static assert(Material.albedo_has_texture.offsetof == 60, "ambient offset incorrect");
+static assert(Material.ambient_has_texture.offsetof == 64, "ambient offset incorrect");
+static assert(Material.specular_has_texture.offsetof == 68, "ambient offset incorrect");
+static assert(Material.shininess.offsetof == 72, "ambient offset incorrect");
+
 struct UIVertex
 {
 	Vec2 p0;
@@ -399,45 +410,47 @@ LoadModel(Renderer* rd, string name)
 		u32 w = m3d.texture[i].w; u32 h = m3d.texture[i].h; u32 ch = m3d.texture[i].f;
 		u8[] tex_data = m3d.texture[i].d[0 .. w * h * ch];
 
+		const(char)[] tex_name = m3d.texture[i].name[0 .. strlen(m3d.texture[i].name)];
 		CreateImageView(&rd.vk, &model.textures[i], w, h, ch, tex_data);
 
 		tex_lookup[i] = Pop(&rd.vk, DT.SampledImage);
 	}
 
+	Material[] mats = AllocArray!(Material)(&rd.temp_arena, m3d.nummaterial);
 	u32[] mat_lookup = AllocArray!(u32)(&rd.temp_arena, m3d.nummaterial);
 	model.materials = AllocArray!(Buffer)(&rd.arena, m3d.nummaterial);
 	foreach(i; 0 .. m3d.nummaterial)
 	{
-		Material mat;
+		const(char)[] mat_name = m3d.material[i].name[0 .. strlen(m3d.material[i].name)];
 
 		foreach(j; 0 .. m3d.material[i].numprop)
 		{
 			switch (m3d.material[i].prop[j].type)
 			{
-			case m3dp_Ka: ConvertColor(&mat.ambient, m3d.material[i].prop[j].value.color); break;
-			case m3dp_Ks: ConvertColor(&mat.specular, m3d.material[i].prop[j].value.color); break;
-			case m3dp_Ns: mat.shininess = m3d.material[i].prop[j].value.fnum; break;
+			case m3dp_Ka: ConvertColor(&mats[i].ambient, m3d.material[i].prop[j].value.color); break;
+			case m3dp_Ks: ConvertColor(&mats[i].specular, m3d.material[i].prop[j].value.color); break;
+			case m3dp_Ns: mats[i].shininess = m3d.material[i].prop[j].value.fnum; break;
 			case m3dp_map_Kd:
 				{
-					mat.albedo_texture = tex_lookup[m3d.material[i].prop[j].value.textureid];
-					mat.albedo_has_texture = true;
+					mats[i].albedo_texture = tex_lookup[m3d.material[i].prop[j].value.textureid];
+					mats[i].albedo_has_texture = true;
 				} break;
 			case m3dp_map_Ka:
 				{
-					mat.ambient_texture = tex_lookup[m3d.material[i].prop[j].value.textureid];
-					mat.ambient_has_texture = true;
+					mats[i].ambient_texture = tex_lookup[m3d.material[i].prop[j].value.textureid];
+					mats[i].ambient_has_texture = true;
 				} break;
 			case m3dp_map_Ks:
 				{
-					mat.specular_texture = tex_lookup[m3d.material[i].prop[j].value.textureid];
-					mat.specular_has_texture = true;
+					mats[i].specular_texture = tex_lookup[m3d.material[i].prop[j].value.textureid];
+					mats[i].specular_has_texture = true;
 				} break;
 			default: break;
 			}
 		}
 
 		CreateBuffer(&rd.vk, &model.materials[i], BT.Uniform, Material.sizeof, false);
-		assert(Transfer(&rd.vk, &model.materials[i], &mat), "LoadModel failure: Transfer error when transferring material");
+		assert(Transfer(&rd.vk, &model.materials[i], &mats[i]), "LoadModel failure: Transfer error when transferring material");
 
 		mat_lookup[i] = Pop(&rd.vk, DT.Material);
 	}
@@ -460,7 +473,7 @@ LoadModel(Renderer* rd, string name)
 	{
 		if (last == u64.max)
 		{
-			model.parts[index].mat = m3d.face[i].materialid != u32.max ? mat_lookup[m3d.face[i].materialid] : 0;
+			model.parts[index].mat = (m3d.face[i].materialid != u32.max) ? mat_lookup[m3d.face[i].materialid] : 0;
 			model.parts[index].offset = 0;
 			last = m3d.face[i].materialid;
 		}
diff --git a/src/gears/vulkan.d b/src/gears/vulkan.d
index 9f08054..61d6ab1 100644
--- a/src/gears/vulkan.d
+++ b/src/gears/vulkan.d
@@ -13,6 +13,7 @@ import renderer;
 import std.math.rounding : Ceil = ceil;
 
 bool g_VLAYER_SUPPORT = false;
+bool g_DEBUG_PRINTF = false;
 
 const FRAME_OVERLAP = 2;
 
@@ -124,6 +125,7 @@ struct Buffer
 {
 	VkBuffer 			buffer;
 	VmaAllocation alloc;
+	u64						size;
 }
 
 struct DescBindings
@@ -403,6 +405,8 @@ CreateBuffer(Vulkan* vk, Buffer* buf, BufferType type, u64 size, bool host_visib
 	VkResult result = vmaCreateBuffer(vk.vma, &buffer_info, &alloc_info, &buf.buffer, &buf.alloc, &vma_info);
 	// TODO: handle errors here then reallocate buffer
 	assert(VkCheck("CreateBuffer failure: vmaCreateBuffer error", result), "CreateBuffer failure");
+
+	buf.size = size;
 }
 
 void
@@ -703,6 +707,12 @@ ImmSubmit(Vulkan* vk, void delegate() fn)
 		success = VkCheck("ImmSubmit failure: vkQueueSubmit2 error", result);
 	}
 
+	if (success)
+	{
+		result = vkWaitForFences(vk.device, 1, &vk.imm_fence, true, 999999999);
+		success = VkCheck("ImmSubmit failure: vkWaitForFences post submission error", result);
+	}
+
 	return success;
 }
 
@@ -1435,7 +1445,7 @@ SetUniform(Vulkan* vk, GlobalUniforms* globals)
 
 	VkDescriptorBufferInfo buffer_info = {
 		buffer: vk.global_buf.buffer,
-		range: VK_WHOLE_SIZE,
+		range: GlobalUniforms.sizeof,
 	};
 
 	VkWriteDescriptorSet write = {
@@ -1739,7 +1749,7 @@ WriteConvDescriptor(Vulkan* vk, Buffer* buf)
 {
 	VkDescriptorBufferInfo buf_info = {
 		buffer: buf.buffer,
-		range: VK_WHOLE_SIZE,
+		range: buf.size,
 	};
 
 	VkWriteDescriptorSet write = {
@@ -1785,7 +1795,7 @@ WriteDescriptors(Vulkan* vk, DescType type, Buffer[] buffers, u32[] indices)
 	foreach(i, buf; buffers)
 	{
 		buffer_info[i].buffer = buf.buffer;
-		buffer_info[i].range = VK_WHOLE_SIZE;
+		buffer_info[i].range = buf.size;
 		
 		writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
 		writes[i].dstSet = vk.desc_sets[type];
@@ -2800,6 +2810,22 @@ InitInstance(Vulkan* vk)
 		ppEnabledExtensionNames: instance_ext.ptr,
 	};
 
+	VkValidationFeatureEnableEXT validation_enable = VK_VALIDATION_FEATURE_ENABLE_DEBUG_PRINTF_EXT;
+
+	VkValidationFeaturesEXT validation_features = {
+		sType: VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT,
+		enabledValidationFeatureCount: 1,
+		pEnabledValidationFeatures: &validation_enable,
+	};
+
+	debug
+	{
+		if (g_VLAYER_SUPPORT && g_DEBUG_PRINTF)
+		{
+			instance_info.pNext = &validation_features;
+		}
+	}
+
 	VkResult result = vkCreateInstance(&instance_info, null, &vk.instance);
 	success = VkCheck("vkCreateInstance failure", result);
 
@@ -2848,14 +2874,19 @@ EnableVLayers(Vulkan* vk)
 		if (g_VLAYER_SUPPORT)
 		{
 			VkDebugUtilsMessengerCreateInfoEXT info = {
-			sType: VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
-			messageSeverity: VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
-											 VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT,
-			messageType: VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT		|
-									 VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
-									 VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT,
-			pfnUserCallback: cast(PFN_vkDebugUtilsMessengerCallbackEXT)&DebugCallback,
-		};
+				sType: VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
+				messageSeverity: VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
+												 VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT,
+				messageType: VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT		|
+										 VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
+										 VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT,
+				pfnUserCallback: cast(PFN_vkDebugUtilsMessengerCallbackEXT)&DebugCallback,
+			};
+
+			if (g_DEBUG_PRINTF)
+			{
+				info.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT;
+			}
 
 			VkResult result = vkCreateDebugUtilsMessengerEXT(vk.instance, &info, null, &vk.dbg_msg);
 			if (result != VK_SUCCESS)
diff --git a/src/gears/vulkan_logging.d b/src/gears/vulkan_logging.d
index ac02998..2accfc5 100644
--- a/src/gears/vulkan_logging.d
+++ b/src/gears/vulkan_logging.d
@@ -3,7 +3,7 @@ import std.stdio;
 import vulkan : Vulkan;
 import std.conv;
 import std.string;
-import core.stdc.string : strlen;
+import core.stdc.string : strlen, strcmp;
 
 extern(System) VkBool32
 DebugCallback(
@@ -15,6 +15,9 @@ DebugCallback(
 {
 	string ms, mt;
 
+	const(char)[] msg = callback_data.pMessage[0 .. strlen(callback_data.pMessage)];
+	bool debug_printf = strcmp(callback_data.pMessageIdName, "WARNING-DEBUG-PRINTF") == 0;
+
 	switch (message_severity) {
 	case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
 		ms = "VERBOSE";
@@ -60,9 +63,14 @@ DebugCallback(
 		break;
 	}
 
-	const char[] msg = callback_data.pMessage[0 .. strlen(callback_data.pMessage)];
-	
-	writefln("[%s: %s]\n%r\n", ms, mt, msg);
+	if (debug_printf)
+	{
+		writefln("SHADER PRINT: %s", msg);
+	}
+	else
+	{
+		writefln("[%s: %s]\n%r\n", ms, mt, msg);
+	}
 
 	return VK_FALSE;
 }
diff --git a/src/shaders/convert.comp.glsl b/src/shaders/convert.comp.glsl
index 0d5c687..d30f114 100644
--- a/src/shaders/convert.comp.glsl
+++ b/src/shaders/convert.comp.glsl
@@ -1,6 +1,7 @@
 #version 460
 
 #extension GL_EXT_shader_8bit_storage : require
+#extension GL_EXT_debug_printf : require
 
 layout (constant_id = 0) const int CHANNELS = 3;
 
@@ -31,23 +32,28 @@ void main()
 
 	if (CHANNELS == 1)
 	{
-		uint index = x + (y * PC.x);
+		uint index = x + y * PC.x;
 	
-		vec4 col = vec4(vec3(uint(src[index])), 1.0);
+		vec4 col = vec4(vec3(uint(src[index]) / 255.0), 1.0);
+		debugPrintfEXT("col = %v4f", col);
 		imageStore(dst, ivec2(x, y), col);
 	}
 	else if (CHANNELS == 2)
 	{
-		uint index = (x + (y * PC.x)) * 2;
+		uint index = (x + y * PC.x) * 2;
 
-		vec4 col = vec4(uint(src[index]), uint(src[index]), uint(src[index]), uint(src[index+1]));
+		float f = uint(src[index]) / 255.0;
+		float a = uint(src[index+1]) / 255.0;
+		vec4 col = vec4(f, f, f, a);
+		debugPrintfEXT("col = %v4f", col);
 		imageStore(dst, ivec2(x, y), col);
 	}
 	else if (CHANNELS == 3)
 	{
-		uint index = (x + (y * PC.x)) * 3;
+		uint index = (x + y * PC.x) * 3;
 
-		vec4 col = vec4(uint(src[index]), uint(src[index+1]), uint(src[index+2]), 1.0);
+		vec4 col = vec4(uint(src[index]) / 255.0, uint(src[index+1]) / 255.0, uint(src[index+2]) / 255.0, 1.0);
+		debugPrintfEXT("col = %v4f", col);
 		imageStore(dst, ivec2(x, y), col);
 	}
 }
diff --git a/src/shaders/structures.layout b/src/shaders/structures.layout
index 9262ee2..53f68cb 100644
--- a/src/shaders/structures.layout
+++ b/src/shaders/structures.layout
@@ -1,3 +1,7 @@
+// ****************************************************************************
+// **** STRUCTS MUST BE PACKED IN OPTIMAL PACKING ORDER TO MATCH D STRUCTS ****
+// ****************************************************************************
+
 layout (set = 0, binding = 0) uniform GlobalUniforms {
 	vec2 res;
 } G;
@@ -13,15 +17,15 @@ layout (set = 0, binding = 3) uniform sampler SamplerNearest;
 layout (set = 1, binding = 0) uniform texture2D Textures[];
 
 layout (set = 2, binding = 0) uniform Material {
+	vec4 ambient;
+	vec4 diffuse;
+	vec4 specular;
 	uint albedo_texture;
 	uint ambient_texture;
 	uint specular_texture;
 	bool albedo_has_texture;
 	bool ambient_has_texture;
 	bool specular_has_texture;
-	vec4 ambient;
-	vec4 diffuse;
-	vec4 specular;
 	float shininess;
 } Materials[];
 
diff --git a/src/shared/util.d b/src/shared/util.d
index a518157..a29e7b5 100644
--- a/src/shared/util.d
+++ b/src/shared/util.d
@@ -377,23 +377,17 @@ struct Vector(T, int S)
 		{
 			T r = 0.0;
 			T g = 0.0;
-			static if (S > 2)
-			T b = 0.0;
-			static if (S > 3)
-			T a = 0.0;
+			static if (S > 2) T b = 0.0;
+			static if (S > 3) T a = 0.0;
 		};
 		struct
 		{
 			T x;
 			T y;
-			static if (S > 2)
-			T z;
-			static if (S > 3)
-			T w;
+			static if (S > 2) T z;
+			static if (S > 3) T w;
 		};
-		static if (S == 4)
 		T[S] v;
-		float4 simd;
 	}
 }