From f604b9a5caf19034f8c067bdec156a7b1262f851 Mon Sep 17 00:00:00 2001
From: matthew <matthew@sleepy.day>
Date: Sat, 12 Jul 2025 08:15:48 +1000
Subject: [PATCH] some work

---
 assets/shaders/gradient.comp.spv | Bin 0 -> 3384 bytes
 assets/shaders/triangle.frag.spv | Bin 572 -> 2120 bytes
 assets/shaders/triangle.vert.spv | Bin 1512 -> 3012 bytes
 dub.json                         |   4 +++-
 src/gears/main.d                 |  16 +++++++++++++
 src/gears/renderer.d             |   2 ++
 src/gears/vulkan.d               |  37 ++++++++++++++++++++++++++-----
 src/gears/vulkan_logging.d       |   3 ++-
 src/generated/assets_codegen.d   |   3 +++
 src/shaders/gradient.comp.glsl   |  27 ++++++++++++++++++++++
 src/shaders/structures.layout    |  33 +++++++++++++++++++++++++++
 src/shaders/triangle.frag.glsl   |   6 +++++
 src/shaders/triangle.vert.glsl   |   6 +++++
 13 files changed, 130 insertions(+), 7 deletions(-)
 create mode 100644 assets/shaders/gradient.comp.spv
 create mode 100644 src/shaders/gradient.comp.glsl
 create mode 100644 src/shaders/structures.layout

diff --git a/assets/shaders/gradient.comp.spv b/assets/shaders/gradient.comp.spv
new file mode 100644
index 0000000000000000000000000000000000000000..49ba2be96752a1db1adec40e55b7a663987ed172
GIT binary patch
literal 3384
zcmZ9O`*IXj5XL8&-AxPvA`k=tH=v>tqars&5J=(@-4JvG;&n2aog|}^opp8-(eeR&
z7yt4-d<*pvEH717`TfpJn_&;t>F)3J?R1|ri$8vL!fT9q`@H?$H(s$0dE?%gMEHf0
z|9ZreO~c`>cBefz7<T6_UV0sm1D@~wrhR-4>R(;FCfW{@o|qzg-n8h7=)UNo=rd6u
zibP+FFnmh!@jK*X^dhFO_~Vj)QG%K`;kDYq;=|QoeP?4M&VxMG-?$gW+M8mpwX)J`
zF9uP+9}I@yrE!oZy*TJ5c^nOs-Iy4Y6}zMtr90iKL0uNr`s+H;6Usk~AH``9Wm(=8
zGU?8>nFg&iTMyHv-fk9!!zAl1Ey$J_Pm2$d@0Ag~?s~A0hu<!3hns-d%!x-?n&nQP
zbUjkcwqlKjlzqeN$gW6uzn5%e`S!qbT?1$3@j!OI>vKywJ`cn@TVXfOt3CyePd^Q#
zcq>a~;Cz`6@$h9%op8IK#`)biRP<qS7G}2^KN{|k(An0#HSy(e80Sftf;IFHjP-bq
zx|_S%5`bRNljV4@g*`XHHBPby?e;e$KZtXUq1Z=f^)t@g@Ng{lZ@a6(9yPdtl6U2s
zL{@Lj-8=GuFdvGZ&w7Jl*c(z4zV0BBAFtnc_x0YqW}!N{-}^)-Md;l184-8Z^fQuK
z=)42$pLM$LdX4QJ)zA@Voh_KN=gkn0g+KaUJm1aN{FybY>d!p!*Yk1y=zIP(H)Hnw
za-W%3_nCDyKRWwGJl|WBZ26H{)%=n4sy{mZ__UOjIh()D-2CZ@&Dk(|uqmI0h;IZj
zm~j!K_W!(}5r)6bzv|C7r&<#_HTfdqF?XxU?tu9p)((3!vcn$vsA{5~rii{AlRhC1
z#(q=!q&OIa{glJ?M+<xI1Q;=~e^Q)S;MYo>yJqnZNXDM{)ABkj-V`0z*Givbr(;`P
z*jhbD%MEOakIvm?9g)>>@$<sTaRN|_y12J?HruB+R@ba#YT+A-{j1{GgJaL$Ya-UH
zcEI@|0jm<eZwMnUHCPXLKVa-HiW8fd^zfrn=8UJ+la4qTwyWacV8lY_EtxHEhd9`N
zT;gEZqVsOBJ)ys!h-3GuI13#+blwk(Ieaco%rSt<GX11{z7UQbJtXFrr5!ji(Rp($
z&a@^@OngIebn{)8OpW09qDLimPQG2qziZ&c;jN(~^TwFNDao7S=-|8^bm}r+Fmfm2
z#IW37NhUWqxzTx7V8lwrt-srn`Ar4G7M=eCfZ3hOB=f#!^@?}{eGwQ$&dYk+#O9u{
ze9>P*>f*%Yy%CT5VLHFbrgJa({YAendvY8U?H8>G<$aMK3}TImevmCb_WzU{%1j<~
z;_#l1iFiv}r7hngFl?y-{gx`_E%Cd7KW_|wz8R-P;AV4LGJaK?=cI%GtT?>YrU*aq
zKb7Z<IO`w9Y>Ll_z~~XO#eQBg`RS?Ue?c<1*}N#3{8gKC(!nkNOOo*e|64gM7yJ)(
zj2d4SHATz_d+MOp^WrRO#pV?e7_}nPH)h3mf|~d)To5rU>&cYlH%t7dvL_cy3>)%X
z7H5%%y-Ol6@*rF6tCFvX?7YN&O9XDQ-!3s?b6$%BxAR_;OdigFJvpf3x;TqEuz5!W
zMjgo3_ZyN&@5Z~rz%%*so^Fc3%;%Qm(Ytcn?eF=_O9%T=eImw!=%xsqIE&)%iRd}!
zqyOmGS)P{U(R*`87`WB8BpJ+n-j_Ujk3J9vZa!_vU{>3*Wa5BZZFeP88}p$ybnKXe
p^$~9GaYgcUsZWUC6Hz<+v*I6$h!;u6mVGed**%2+t1rM+(SPm?7-j$f

literal 0
HcmV?d00001

diff --git a/assets/shaders/triangle.frag.spv b/assets/shaders/triangle.frag.spv
index c9fb61090d888854d1b7a96b39eb906f3430f92c..d039d54fe791968c68c7e439ab64b2fec2cbd82c 100644
GIT binary patch
literal 2120
zcmZvd+fEcg5QZCOcTo_<6AGd(;Q4?jFeXM#M6#NoU_j&DW?Xt@l3`|@omIT^0euVg
z9lSB||9YljG!`kU>#t*X)j%*jKVlj~X3UJ6B~#E*Gi-)*M1DVEWNSFRwYsso(9gFP
z7ME`0dDsNzhwS(s(N9eh-U*{b!W<MI5>JY!#53aa;)~*|;ydC+@r3daHzE%7Gc5T{
zNozt{tL>F{o9*|5Zr5h*%<8vII##v=-j<}vAc?wZw$uJN2;-<5*-Z9P?5(x6*6K>T
z)9bbS`Ip$X<0!H1tthjdJo;p*;qsJzQPPPATUCd;JgRr9o4UJKI>?vPIL*|mkh;5P
zHw!;_u&y`L)0kGAz7OL!MSp!GwB~T)GTT>V;NGX@@-)mT$&KxB%VyP>0w<;yhaJ0}
z#&U46yz7RT9(dnpS@`+IPWVAr6Vh<+y%Fy8Vw=6Pp(^HuFEiM*yZL}7oNwJ+l6)EF
zHjBa-tf3z;=<m99H$U%70^aGm<V)M%#-DqlLmHm5-_ZH3&2qb2*wLY0$~!d7g3g8g
zsT(&odH{z$DK_f(ers-js0YIR@5*O6P5OD5<n%-=81#4lf!n+FWz9!@vZv>qSD~}B
z`+DH!#ZEp~4Q2|>7sAD}-?RVdb9;K=X6oaaFI0_ZhQ#w7(GU85e9g@jJ2|j3=c=7=
z3VTr6(W`c5jU6H$9eYtPa5E-1_w)0v_Q$tcjYlV*n3k$CXCLop?&Hbn=j<_hxT%<i
zc%sa~jEfw#y?LJ&M!cVYHJ-m6)t=DlDG<{WbN4;@9q{qTWx+NpKm0jQ>O?<H@hSDk
z-y(Fr{ic2&ki-}KVX3n>VEB(p;*XC1nB<Tc9Dj873hcUcd=HC_`TB(T<2r%S%Q<CX
z&%nravc$p2h0e}-Uv`REe0ei)FnrP3C$K4P`m`jz^id`3FgebY27JkZ&dx#8@;WPt
zpZ`YC@k3|#AZj%w|5wY`KB<^l`QQifF6eV&d}gH2OE$$|)Vv@Gfm0KmeTI0qOOn(i
z_Oc|pkG-NZcLXOEon0=lz+BV$ryiL+>@hlL_LsSz)tS9T2WKzQ>C4B0QTvu8IecyY
zVNwU2+UV>o7`fO{`X<*sNp=eiU-ZQiyRYwo81@ok-+l?HOFk0HzKx67wbw$)d8EW7
m_AtIX{Dvyn(Gny7x^B#!kBN!LA3HnySXJo{+izufApQeF5w79@

delta 92
zcmX>hu!qH&nMs+QfsK)Yn}L@>m;nL=8JHLtflO`&HZbk(6YQf`T#}+^Vrl?V!N<T1
gRtQqV&%i#>TXJHH)WlnLlb97Ie_@$0c?0_l0L+XIyZ`_I

diff --git a/assets/shaders/triangle.vert.spv b/assets/shaders/triangle.vert.spv
index 291e27e7f3c2d208014be6b535c7ceef4428fae1..44718ec1bf216ee663cc31191eff6c3a47f29afd 100644
GIT binary patch
literal 3012
zcmZvdYj;yc6ox0wrN~u4KoDx$YEi%n3Wy+=kd{zMFPP%;Th<|&v}di;B%Yig`pJLh
zAMjr&|G_V=<@?N;i3gX{wX^4a_ht6X>@zLTEzg@;$s94q%nOr`lV;A8G)4dMo{_EQ
zaI4*EuTHZ5>djl%@jPzI=1<x2Jz-8knTq5fiigaPO3q1^BrB2|k~@-nk_VE8WL>f$
zc`n(Nl=U|!{kxJ@%)Du}yX!yfc3(~h1DkeJt6w|pS=kN++i*0T4&%WnJ?Q>8jgoi}
z+f??$*jwA%t@e7iHy(E<+0TjXCh^dA`*CV}S^UbfhRfsq;$bhD_KOZxc@+0lHC4B-
z@n{lf@n|?vt@yCd-Y6NRBC0yCy6|4o-LdKSHqGp7L9sc{9Gg!ecHa4G%Q+tpvrhbr
zsv{=1aVCmsCh>SJo@5bc5Nu^{n<mN3R@FIj?hNYT{1u-UvoY*b5qsfI25Gd{q;~In
zTe_8uUPj4_{9LuCn)V3KNbN+CWp|e?Ve)@1-Pw=&HZ8{FJTc=W>e>BKA_o^s4|F8d
zKrgJN(N7x((H@&7Ujut|Fivc`Wh1Sa<-YXGu6><NDZ=?y%@gU(D6?rCC2*WG9OLbE
ztFG6AFA2E2XVRN?vX4Le1T)lh&feBM+#+@`Lp|VX-O@a_KXz@3jT+z?uhao?FVtIc
zz0P_t?EgFYG}TJF)r^{mg=4&3f7yK_J5Ak>&c7}@eeqN|m@|&#YR1u1aOmJi3><wE
zIOcHldP~3b3;2r1^vQyR!P@jfSUdE^va{y#eCLb*!J!|Cr(Z%mb4D?q{ve*ZsR#UT
ze8u$)c5+~+hl=)wFn0EZ9bB~2N7xzI!PrX<mtFsmoAU|1RIHCTs~8U^o*4G`%+HBu
z&Is{vp@#xT4V&_*N#2!^gZ{~DsLXoleR0Hx-YUlPh8AlAQ&U+&K6)z8m-n3Dtftel
zU|W<Q{>;y6Mm=@OIn_5W4aRmx_>gp6!no@3JDL-JQTVVlF>rNZ`iXe>dmbP49P!wW
zNf-ei&*5*^v}baikl+I!d^j(Shr#Eh02~syQ<@W#b2V4PX<_o=kDWd0-<hi;?BR?s
zT-d`|Z--|OVBUUe5A|?I#{8;!YA*J?5FB+QfxqB!um%2uf-g3B*1ISn7jgJd?<Hy0
z=DTHm?u75OB;gJ|l*SIXpjlly#9%|Xn?-5%T$ivf@R9_MyIz*AOG*;f0e>W65dX0>
zHhAK}E1tvtiRRS79fDV-$xSWb>mGB~#Di~m4*Qpy6OVmCk-Rw}*H@a;lW@d>?|2Sh
z-WOuYbJz25_=0&`h(E7e{ze*K_EH?!5pvx327Ji@=KWz@kk><L{2oDQfbn}I-H<R?
z>#_9ztrgbh{+jZ^kNYF%nluBRoM7HA277%XO-^E4(%=yLRP#9rJh5QjEx5~y{Z{&o
z4wyW=SzzY8Rov4h%{QgN@LSSg>I$)Nti3Hwj<EKQ=BxwH+F;%%ICAkeQ8&3d(tK}l
z_=0ymcU$iOG4wlw9{Nj6Rr-Mt?+M>EbG}QynfvlymcA@mku>B@KYl8~A0D51=_?ZW
z=klSRtDcjZao0S@J?$upv-wPdFE+k$zFXFz&p($eN%&r<3ygoL>kG|8UG(`)3AMxH
UL(kumz!T4R0sh;R)aNDh50y9hC;$Ke

delta 105
zcmX>i{({??nMs+QfsK)Yn}L_Xi~#}!8JHLtflO`&HZbk(6YQf`T#}+^Vrl?V!N<T1
rRtQqV&%ia&Ta}v`D8vNho?&Fzc-@k5@($*j%^YlNm^N?V5@7@YURn;f

diff --git a/dub.json b/dub.json
index 59f9655..ed5e37b 100644
--- a/dub.json
+++ b/dub.json
@@ -13,7 +13,7 @@
 			"sourcePaths": ["src/gears", "src/shared", "src/generated"],
 			"libs-linux": ["xcb", "X11", "X11-xcb", "vulkan", "stdc++"],
 			"libs-windows": [],
-			"preGenerateCommands-linux": ["./build-vma.sh", "build/Packer"],
+			"preGenerateCommands-linux": ["./build-vma.sh", "build/Codegen", "dub main:packer", "build/Packer"],
 			"preGenerateCommands-windows": [],
 		},
 		{
@@ -26,6 +26,7 @@
 			"sourceFiles-linux": ["build/libxxhash.a", "build/libstb_image.a", "build/libm3d.a"],
 			"preGenerateCommands-linux": ["./build-vma.sh"],
 			"preGenerateCommands-windows": [],
+			"dflags-dmd": ["-P=-DXXH_VECTOR=0", "-P=-DSTBI_NO_SIMD", "-P=-DXXH_NO_PREFTECH"],
 		},
 		{
 			"name": "codegen",
@@ -38,6 +39,7 @@
 			"preGenerateCommands-linux": ["./build-vma.sh"],
 			"preGenerateCommands-windows": [],
 			"versions": ["codegen"],
+			"dflags-dmd": ["-P=-DXXH_VECTOR=0", "-P=-DSTBI_NO_SIMD", "-P=-DXXH_NO_PREFTECH"],
 		}
 	]
 }
diff --git a/src/gears/main.d b/src/gears/main.d
index 2f4ad84..4b30387 100644
--- a/src/gears/main.d
+++ b/src/gears/main.d
@@ -35,5 +35,21 @@ void main()
 
 	auto pipeline = vk.CreateGraphicsPipeline(&vulkan, &pipeline_info);
 
+	u8[] comp_bytes = ap.LoadAssetData("shaders/gradient.comp");
+	assert(comp_bytes != null, "Unable to load compute shader data");
+
+	auto comp_module = vk.BuildShader(&vulkan, comp_bytes);
+	assert(comp_module.ok, "Unable to build compute shader");
+
+	auto comp_pipeline = vk.CreateComputePipeline(&vulkan, comp_module.value);
+
+	vk.Destroy(&vulkan, comp_module.value);
+	vk.Destroy(&vulkan, comp_pipeline);
+
+	vk.Destroy(&vulkan, vert_module.value);
+	vk.Destroy(&vulkan, frag_module.value);
+	vk.Destroy(&vulkan, pipeline);
+
 	vk.Destroy(&vulkan);
 }
+
diff --git a/src/gears/renderer.d b/src/gears/renderer.d
index 226df72..1c9a3f8 100644
--- a/src/gears/renderer.d
+++ b/src/gears/renderer.d
@@ -28,3 +28,5 @@ struct GfxPipelineInfo
 	u32 input_rate_stride;
 	Attribute[] vertex_attributes;
 }
+
+
diff --git a/src/gears/vulkan.d b/src/gears/vulkan.d
index 759ae5a..aeb3adc 100644
--- a/src/gears/vulkan.d
+++ b/src/gears/vulkan.d
@@ -228,7 +228,7 @@ BuildShader(Vulkan* vk, u8[] bytes)
 	return shader;
 }
 
-VkPipeline
+Pipeline
 CreateGraphicsPipeline(Vulkan* vk, GfxPipelineInfo* build_info)
 {
 	VkDynamicState[] dyn_state = [ VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR ];
@@ -274,6 +274,8 @@ CreateGraphicsPipeline(Vulkan* vk, GfxPipelineInfo* build_info)
 	VkPipelineRenderingCreateInfo rendering_info = {
 		sType: VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO,
 		colorAttachmentCount: 1,
+		pColorAttachmentFormats: &vk.draw_image.base.format,
+		depthAttachmentFormat: vk.depth_image.base.format,
 	};
 
 	VkPipelineColorBlendAttachmentState blend_state = {
@@ -349,16 +351,41 @@ CreateGraphicsPipeline(Vulkan* vk, GfxPipelineInfo* build_info)
 	return pipeline;
 }
 
-VkPipeline
-CreateComputePipeline(Vulkan* vk, string shader)
+
+Pipeline
+CreateComputePipeline(Vulkan* vk, Shader shader)
 {
+	VkComputePipelineCreateInfo info = {
+		sType: VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO,
+		layout: vk.pipeline_layout,
+		stage: {
+			sType: VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
+			stage: VK_SHADER_STAGE_COMPUTE_BIT,
+			pName: "main",
+		},
+	};
+
+	__traits(getMember, &info.stage, "module") = shader;
+
 	VkPipeline pipeline;
-
-
+	VkResult result = vkCreateComputePipelines(vk.device, null, 1, &info, null, &pipeline);
+	assert(VkCheck("CreateComputePipeline failure", result), "Unable to build pipeline");
 
 	return pipeline;
 }
 
+void
+Destroy(Vulkan* vk, Shader shader)
+{
+	vkDestroyShaderModule(vk.device, shader, null);
+}
+
+void
+Destroy(Vulkan* vk, Pipeline pipeline)
+{
+	vkDestroyPipeline(vk.device, pipeline, null);
+}
+
 void
 Destroy(Vulkan* vk)
 {
diff --git a/src/gears/vulkan_logging.d b/src/gears/vulkan_logging.d
index 76a1cfc..47c2fb3 100644
--- a/src/gears/vulkan_logging.d
+++ b/src/gears/vulkan_logging.d
@@ -3,6 +3,7 @@ import std.stdio;
 import vulkan : Vulkan;
 import std.conv;
 import std.string;
+import core.stdc.string : strlen;
 
 VkBool32
 DebugCallback(
@@ -59,7 +60,7 @@ DebugCallback(
 		break;
 	}
 
-	string msg = to!string(callback_data.pMessage);
+	const char[] msg = callback_data.pMessage[0 .. strlen(callback_data.pMessage)];
 	
 	writefln("[%s: %s]\n%r\n", ms, mt, msg);
 
diff --git a/src/generated/assets_codegen.d b/src/generated/assets_codegen.d
index eea100f..ac1a0c0 100644
--- a/src/generated/assets_codegen.d
+++ b/src/generated/assets_codegen.d
@@ -27,16 +27,19 @@ static immutable u64[] MODEL_HASHES = [
 
 static immutable string[] SHADER_FILES = [
 	"shaders/triangle.vert.spv",
+	"shaders/gradient.comp.spv",
 	"shaders/triangle.frag.spv",
 ];
 
 static immutable string[] SHADER_NAMES = [
 	"shaders/triangle.vert",
+	"shaders/gradient.comp",
 	"shaders/triangle.frag",
 ];
 
 static immutable u64[] SHADER_HASHES = [
 	8769314645675479020,
+	16130483095684998267,
 	6282520872716708711,
 ];
 
diff --git a/src/shaders/gradient.comp.glsl b/src/shaders/gradient.comp.glsl
new file mode 100644
index 0000000..0d838e5
--- /dev/null
+++ b/src/shaders/gradient.comp.glsl
@@ -0,0 +1,27 @@
+#version 460
+
+#extension GL_EXT_buffer_reference : require
+#extension GL_GOOGLE_include_directive : require
+
+#include "structures.layout"
+
+layout (local_size_x = 16, local_size_y = 16) in;
+
+void main()
+{
+	ivec2 texel_coord = ivec2(gl_GlobalInvocationID.xy);
+	ivec2 size = imageSize(DrawImage);
+
+	if (texel_coord.x < size. x && texel_coord.y < size.y)
+	{
+		vec4 color = vec4(0.0);
+
+		if (gl_GlobalInvocationID.x != 0 && gl_LocalInvocationID.y != 0)
+		{
+			color.x = float(texel_coord.x) / size.x;
+			color.y = float(texel_coord.y) / size.y;
+		}
+
+		imageStore(DrawImage, texel_coord, color);
+	}
+}
diff --git a/src/shaders/structures.layout b/src/shaders/structures.layout
new file mode 100644
index 0000000..f6788dc
--- /dev/null
+++ b/src/shaders/structures.layout
@@ -0,0 +1,33 @@
+struct Vertex {
+	vec4 pos;
+};
+
+layout (buffer_reference, std430) readonly buffer VertexBuffer {
+	Vertex vertices[];
+};
+
+layout (set = 0, binding = 0) uniform GlobalUniforms {
+	vec2 res;
+} G;
+
+layout (set = 0, binding = 1) uniform ShaderUniforms {
+	float placeholder;
+} S;
+
+layout (rgba16f, set = 0, binding = 2) uniform image2D DrawImage;
+
+layout (set = 0, binding = 3) uniform sampler SamplerNearest;
+
+layout (set = 1, binding = 0) uniform texture2D Textures[];
+
+layout (set = 2, binding = 0) uniform Material {
+	float placeholder;
+} Materials[];
+
+layout (set = 3, binding = 0) uniform Mesh {
+	VertexBuffer buf;
+} Meshes[];
+
+layout (push_constant) uniform Constants {
+	float placeholder;
+} PC;
diff --git a/src/shaders/triangle.frag.glsl b/src/shaders/triangle.frag.glsl
index ad91eb6..e752f65 100644
--- a/src/shaders/triangle.frag.glsl
+++ b/src/shaders/triangle.frag.glsl
@@ -1,5 +1,11 @@
 #version 460
 
+#extension GL_EXT_buffer_reference : require
+#extension GL_GOOGLE_include_directive : require
+#extension GL_EXT_nonuniform_qualifier : require
+
+#include "structures.layout"
+
 layout (location = 0) in vec3 fragColor;
 
 layout (location = 0) out vec4 outColor;
diff --git a/src/shaders/triangle.vert.glsl b/src/shaders/triangle.vert.glsl
index 18e8b61..cc359d2 100644
--- a/src/shaders/triangle.vert.glsl
+++ b/src/shaders/triangle.vert.glsl
@@ -1,5 +1,11 @@
 #version 460
 
+#extension GL_EXT_buffer_reference : require
+#extension GL_GOOGLE_include_directive : require
+#extension GL_EXT_nonuniform_qualifier : require
+
+#include "structures.layout"
+
 layout (location = 0) out vec3 fragColor;
 
 vec2 positions[3] = vec2[](