From 77ce53d4f1d714ee77f7831e23fe808815cc420e Mon Sep 17 00:00:00 2001
From: matthew <matthew@sleepy.day>
Date: Wed, 29 Oct 2025 06:39:56 +1100
Subject: [PATCH] finish vulkan init (outside of description)

---
 assets/shaders/gradient.comp.spv | Bin 4496 -> 4268 bytes
 assets/shaders/pbr.frag.spv      | Bin 7472 -> 7244 bytes
 assets/shaders/pbr.vert.spv      | Bin 4824 -> 4596 bytes
 dub.json                         |   2 +-
 src/VulkanRenderer               |   2 +-
 src/gears/game2.d                |  38 ++++++++++++++++++++++++++++++-
 src/shaders/structures.layout    |  18 ++++++---------
 7 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/assets/shaders/gradient.comp.spv b/assets/shaders/gradient.comp.spv
index 1bae4a0b7df41ffdddac9b939571b0767ec1a3b9..6b76056b2626cf77f5d320c2640af913993eb411 100644
GIT binary patch
delta 76
zcmbQByhd?@8#6l_Lly%A1M}pI%;JnJn_n^?W@2QVyp~O#k!kW-w&KYX*kypMwd~1^
YOq&Hco-*^ZgVpN*^?>naQJ!j60N;EOAOHXW

delta 291
zcmZ3ZI6--X8*@DeLly%A12YgO<|L)2<i}?u7RQ&QR+N+$r7|$EF+k*5K=QdsnW=dt
zC<@pZIKlc^f%3%#smY}|iA5+1fZ{MS*uZuaWF#Uh-~lUO0~^9V*_T<Ikz;cz^I;}N
zrpcOY@{Ej=J=uzVJs4QwwkQKNSO76h3}h-u%mzt}9V+I4B*p<1bD6voZ0=3AWJbo#
aw(L)t`MJS{>i`vi@#Kr#!kbOFD_8+*9yd+^

diff --git a/assets/shaders/pbr.frag.spv b/assets/shaders/pbr.frag.spv
index a354898ea2abade9a8b3ab98dff2481f8a06ea5f..f0971413101b86ca8284551452f8cd5f78951cd5 100644
GIT binary patch
delta 94
zcmdmBb;e?YAG16gLm2}D12Yg8XJqDO=A{-F1KDg0tYC4L%^#WdStb{7$S^WZ?&Vkv
kBn>&U85t+f<^0dcw0SNUD-%CESS3497Z`6o$dfMs00k`+F8}}l

delta 309
zcmX?OvB7GCA9FniLm2}D12YgO<|L)2<i}?u7RQ&QR+N+$r7|$EF+k*5K=QdsnW=dt
zC<@pZIKlc^f%3%#smY}|iA5+1fZ{MS*uZuaWF#UhPys7o0~^8)G9)82FEcN-xEL(X
z3Kr+soXf1w;_JZx;ezZ^24V{!hKYg928r1qiGhp*i8&yNaX`gfCeLJ-XJnkblYKFe
mjOEB?WSV@E<3A(g=98SPO#Iw%_kavxpKQn@y!ioljsO5<8$192

diff --git a/assets/shaders/pbr.vert.spv b/assets/shaders/pbr.vert.spv
index 24c8ef2b6e6f56d7707c1ddc208a11b93bf4c394..3440819d84b8f392f27d6be6b6b1934a992ef097 100644
GIT binary patch
delta 77
zcmcbi`bBxeB^GuzhI|GF2Ik4Jtm2F;n@d?=Gcq!5PGq0W$jCVPFNZuM(_~rB;>iy<
ZWq`teIbB)#*})pvfttX0b0U8^GXNNw5xW2Y

delta 310
zcmeyOd_#4^C6;;)hI|GF24)~m%t=a3$&b%SERHWpttcriN@ZYRV}QuBfaG(NGE?(P
zP!zB+aDw%-0_BSfQj<$_5{pn20L5Wuuz~F;$Vfz1paNFF1~!BpWJpG4US?iuaWPn&
z6)euN`6J6~Mn=ZXciCn$GBQoB<dA1%oII1G*w=#rq5@>SG7wt;F-#0(9Z1XuNepBI
oNX!9Ai~}m>GMSSTXzpfBPFGfbZn%R$TG%Ha<QCrCz*oWy0NFk~E&u=k

diff --git a/dub.json b/dub.json
index 8d71202..516ed99 100644
--- a/dub.json
+++ b/dub.json
@@ -16,7 +16,7 @@
 			"versions": ["VULKAN_DEBUG"],
 			"preGenerateCommands-linux": ["./build.sh"],
 			"preGenerateCommands-windows": [],
-			"dflags": ["-Xcc=-mno-sse", "-P-I/usr/include/freetype2", "-vgc", "-Jbuild", "-Jassets/fonts"],
+			"dflags": ["-Xcc=-mno-sse", "-P-I/usr/include/freetype2", "-Jbuild", "-Jassets/fonts"],
 			"dflags-dmd": ["-P=-DSTBI_NO_SIMD"]
 		},
 		{
diff --git a/src/VulkanRenderer b/src/VulkanRenderer
index 53c500c..1b4d997 160000
--- a/src/VulkanRenderer
+++ b/src/VulkanRenderer
@@ -1 +1 @@
-Subproject commit 53c500c302e87799b01bb99356780c9c51b41170
+Subproject commit 1b4d9979765ca8a1c1f45ddf8420edc93d1b79dc
diff --git a/src/gears/game2.d b/src/gears/game2.d
index d5ad175..cfbdaf3 100644
--- a/src/gears/game2.d
+++ b/src/gears/game2.d
@@ -14,12 +14,28 @@ struct RenderState
 {
 	Renderer         rd;
 	Arena[2]         frame_arenas;
+
+	PushConst        pc;
+	ShaderGlobals    globals;
+
 	Pipeline         pipeline_pbr;
 	DescSetLayout    desc_layout_globals;
 	DescSetLayout    desc_layout_resources;
 	DescSet[2]       desc_set_globals;
 	DescSet[2]       desc_set_resources;
 	PipelineLayout   pipeline_layout_pbr;
+
+	ImageView        placeholder_tex;
+	Buffer           globals_buffer;
+}
+
+struct ShaderGlobals
+{
+	Vec4 ambient;
+	Vec4 diffuse;
+	Vec4 specular;
+	f32  shininess = 0.0;
+	f32  alpha     = 0.0;
 }
 
 struct PushConst
@@ -76,7 +92,7 @@ Init(RenderState* rds, PlatformWindow* window)
 		};
 	}
 
-	DescLayoutBinding[5] global_bindings = [
+	DescLayoutBinding[3] global_bindings = [
 		{ binding: 0, descriptorType: DT.Uniform,         descriptorCount: 1, stageFlags: SS.All },
 		{ binding: 1, descriptorType: DT.StorageTexelBuf, descriptorCount: 1, stageFlags: SS.All },
 		{ binding: 2, descriptorType: DT.StorageImage,    descriptorCount: 1, stageFlags: SS.All },
@@ -124,4 +140,24 @@ Init(RenderState* rds, PlatformWindow* window)
 
 	bool result = CreateGraphicsPipeline(&rds.rd, &rds.pipeline_pbr, &pbr_info);
 	assert(result);
+
+	const u64 tex_size = 32*32*4;
+	u8[tex_size] placeholder_tex;
+
+	u8[4] magenta = [255, 0, 255, 255];
+	u8[4] black   = [0,   0, 0,   255];
+	u64 half      = tex_size/2;
+	for(u64 i = 0; i < tex_size; i += 32)
+	{
+		bool swap = i <= half;
+		for(u64 j = 0; j < 16; j += 4)
+		{
+			placeholder_tex[i+j .. i+j+4]       = !swap ? magenta[0 .. $] : black[0 .. $];
+			placeholder_tex[i+j+16 .. i+j+16+4] = !swap ? black[0 .. $]   : magenta[0 .. $];
+		}
+	}
+
+	CreateImageView(&rds.rd, &rds.placeholder_tex, 32, 32, 4, placeholder_tex);
+
+	CreateBuffer(&rds.rd, &rds.globals_buffer, BT.Uniform, ShaderGlobals.sizeof, false);
 }
diff --git a/src/shaders/structures.layout b/src/shaders/structures.layout
index 02a1100..9e5c237 100644
--- a/src/shaders/structures.layout
+++ b/src/shaders/structures.layout
@@ -32,25 +32,21 @@ layout (set = 1, binding = 0)         uniform Globals {
 
 layout (set = 1, binding = 1, rg32ui) uniform coherent uimageBuffer ImageABuffer;
 
-layout (set = 2, binding = 2, r32ui)  uniform coherent uimage2D ImageAux;
+layout (set = 1, binding = 2, r32ui)  uniform coherent uimage2D ImageAux;
 
 // SET 2
 
-layout (set = 1, binding = 0) uniform texture2D Textures[IMG_MAX];
+layout (set = 2, binding = 0) uniform texture2D Textures[IMG_MAX];
 
-layout (set = 1, binding = 1) uniform Material {
-	vec4 ambient;
-	vec4 diffuse;
-	vec4 specular;
-	bool albedo_has_texture;
-	bool ambient_has_texture;
-	bool specular_has_texture;
-	bool alpha_has_texture;
+layout (set = 2, binding = 1) uniform Material {
+	vec4  ambient;
+	vec4  diffuse;
+	vec4  specular;
 	float shininess;
 	float alpha;
 } Materials[BUF_MAX];
 
-layout (set = 1, binding = 2) uniform ModelState {
+layout (set = 2, binding = 2) uniform ModelState {
 	mat4 model_matrix;
 } State[UNI_MAX];