Vulkan_Helpers: Reduce MyVertex struct

Cannot be reduced as much as the SDL3_GPU experiment's MyVertex struct, though.
Due to alignment issues.
I find this odd.
I'm supposed to have MORE control here, but I can't seem to get it out.
Oh well...

Author: TechnicJelle

Vulkan_Helpers/assets/shaders/compiled/tex_image.frag.spv

@@ -1,8 +1,7 @@
 #version 450
 
 //shader input
-layout (location = 0) in vec4 inColor;
-layout (location = 1) in vec2 inUV;
+layout (location = 0) in vec2 inUV;
 
 //output write
 layout (location = 0) out vec4 outFragColor;

Vulkan_Helpers/assets/shaders/compiled/triangle.frag.spv

@@ -2,15 +2,11 @@
 
 #extension GL_EXT_buffer_reference : require
 
-layout (location = 0) out vec4 outColor;
-layout (location = 1) out vec2 outUV;
+layout (location = 0) out vec2 outUV;
 
 struct Vertex {
-	vec3 position;
-	float uv_x;
-	vec3 normal;
-	float uv_y;
-	vec4 color;
+	vec4 position;
+	vec2 uv;
 };
 
 layout(buffer_reference, std430) readonly buffer VertexBuffer{
@@ -32,7 +28,6 @@ void main()
 	Vertex v = PushConstants.vertexBuffer.vertices[gl_VertexIndex];
 
 	//output data
-	gl_Position = PushConstants.projectionMatrix * PushConstants.viewMatrix * PushConstants.modelMatrix * vec4(v.position, 1.0);
-	outColor = v.color;
-	outUV = vec2(v.uv_x, v.uv_y);
+	gl_Position = PushConstants.projectionMatrix * PushConstants.viewMatrix * PushConstants.modelMatrix * v.position;
+	outUV = v.uv;
 }

Vulkan_Helpers/assets/shaders/compiled/triangle.vert.spv

@@ -34,11 +34,8 @@ struct AllocatedBuffer {
 };
 
 struct MyVertex {
-	math::float3 pos;
-	float uvX; //spread out to keep the struct small
-	math::float3 normal;
-	float uvY; //spread out to keep the struct small
-	math::float4 colour;
+	math::float4 pos;
+	math::float2 uv;
 };
 
 struct GPUMeshBuffers {

…lpers/assets/shaders/tex_image.frag.glsl …elpers/assets/shaders/triangle.frag.glslVulkan_Helpers/assets/shaders/tex_image.frag.glsl renamed to Vulkan_Helpers/assets/shaders/triangle.frag.glsl Vulkan_Helpers/assets/shaders/tex_image.frag.glsl renamed to Vulkan_Helpers/assets/shaders/triangle.frag.glsl

@@ -383,7 +383,7 @@ SDL_AppResult VulkanEngine::InitPipelines() {
 SDL_AppResult VulkanEngine::InitMeshPipeline() {
 	VkShaderModule meshFragShader;
 	{
-		const std::filesystem::path fullPath = GetAssetsDir() / "shaders/compiled/" / "tex_image.frag.spv";
+		const std::filesystem::path fullPath = GetAssetsDir() / "shaders/compiled/" / "triangle.frag.spv";
 		if (const std::optional<VkShaderModule> meshFragShaderResult = vk_util::LoadShaderModule(fullPath.string().c_str(), device); !meshFragShaderResult.has_value()) {
 			SDL_Log("Couldn't load mesh fragment shader module");
 			return SDL_APP_FAILURE;

Vulkan_Helpers/assets/shaders/triangle.vert.glsl

@@ -39,24 +39,10 @@ std::optional<std::vector<std::shared_ptr<MeshAsset>>> ImportMesh(VulkanEngine*
 		for (int i = 0; i < mesh->mNumVertices; i++) {
 			const aiVector3D& pos = mesh->mVertices[i];
 			const aiVector3D& tex = mesh->mTextureCoords[0][i];
-			const aiVector3D& nor = mesh->HasNormals() ? mesh->mNormals[i] : aiVector3D{0.0f, 0.0f, 1.0f}; // Default normal if no normals are present
-			aiColor4D col;
-			if (mesh->HasVertexColors(i)) {
-				col = mesh->mColors[0][i];
-			} else {
-				// If no vertex colours, we choose a "random" colour
-				float r = 0.5f + 0.5f * sinf(static_cast<float>(i) * 0.1f);
-				float g = 0.5f + 0.5f * sinf(static_cast<float>(i) * 0.2f);
-				float b = 0.5f + 0.5f * sinf(static_cast<float>(i) * 0.3f);
-				col = aiColor4D{r, g, b, 1.0f};
-			}
-			SDL_Log("Assimp: Vertex %d: pos{x: %f, y: %f, z: %f} tex{x: %f, y: %f, z: %f} col{r: %f, g: %f, b: %f, a: %f}", i, pos.x, pos.y, pos.z, tex.x, tex.y, tex.z, col.r, col.g, col.b, col.a);
+			SDL_Log("Assimp: Vertex %d: pos{x: %f, y: %f, z: %f} tex{x: %f, y: %f, z: %f}", i, pos.x, pos.y, pos.z, tex.x, tex.y, tex.z);
 			vertices[i] = MyVertex{
-				.pos = math::float3(pos.x, pos.y, pos.z),
-				.uvX = tex.x,
-				.normal = math::float3(nor.x, nor.y, nor.z),
-				.uvY = tex.y,
-				.colour = math::float4(col.r, col.g, col.b, col.a),
+				.pos = math::float4(pos.x, pos.y, pos.z, 1.0f),
+				.uv = math::float2(tex.x, tex.y),
 			};
 		}
 		// > Indices