From 74eba7266ef4d31c760960640611725cb8617fe2 Mon Sep 17 00:00:00 2001 From: Jayden Grubb Date: Wed, 23 Apr 2025 00:08:35 +1000 Subject: [PATCH] Add VertexAttribute and VertexBinding to GraphicsPipelineParams --- engine/include/nova/render/render_fwd.h | 225 +++++++++++++++++ engine/include/nova/render/render_params.h | 19 +- engine/src/drivers/vulkan/render_driver.cpp | 255 +++++++++++++++++++- 3 files changed, 491 insertions(+), 8 deletions(-) diff --git a/engine/include/nova/render/render_fwd.h b/engine/include/nova/render/render_fwd.h index 73a8e8f..30bc9c1 100644 --- a/engine/include/nova/render/render_fwd.h +++ b/engine/include/nova/render/render_fwd.h @@ -9,14 +9,239 @@ namespace Nova { enum class CullMode { NONE, FRONT, BACK }; enum class FrontFace { CLOCKWISE, COUNTER_CLOCKWISE }; + enum class InputRate { VERTEX, INSTANCE }; enum class PipelineType { GRAPHICS, COMPUTE }; enum class PrimitiveTopology { POINT_LIST, LINE_LIST, LINE_STRIP, TRIANGLE_LIST, TRIANGLE_STRIP }; enum class RenderAPI { DX12, VULKAN }; enum class ShaderStage { VERTEX, FRAGMENT, GEOMETRY, TESS_CONTROL, TESS_EVAL, COMPUTE, MESH, TASK }; + enum class DataFormat { + UNDEFINED, + R4G4_UNORM_PACK8, + R4G4B4A4_UNORM_PACK16, + B4G4R4A4_UNORM_PACK16, + R5G6B5_UNORM_PACK16, + B5G6R5_UNORM_PACK16, + R5G5B5A1_UNORM_PACK16, + B5G5R5A1_UNORM_PACK16, + A1R5G5B5_UNORM_PACK16, + R8_UNORM, + R8_SNORM, + R8_USCALED, + R8_SSCALED, + R8_UINT, + R8_SINT, + R8_SRGB, + R8G8_UNORM, + R8G8_SNORM, + R8G8_USCALED, + R8G8_SSCALED, + R8G8_UINT, + R8G8_SINT, + R8G8_SRGB, + R8G8B8_UNORM, + R8G8B8_SNORM, + R8G8B8_USCALED, + R8G8B8_SSCALED, + R8G8B8_UINT, + R8G8B8_SINT, + R8G8B8_SRGB, + B8G8R8_UNORM, + B8G8R8_SNORM, + B8G8R8_USCALED, + B8G8R8_SSCALED, + B8G8R8_UINT, + B8G8R8_SINT, + B8G8R8_SRGB, + R8G8B8A8_UNORM, + R8G8B8A8_SNORM, + R8G8B8A8_USCALED, + R8G8B8A8_SSCALED, + R8G8B8A8_UINT, + R8G8B8A8_SINT, + R8G8B8A8_SRGB, + B8G8R8A8_UNORM, + B8G8R8A8_SNORM, + B8G8R8A8_USCALED, + B8G8R8A8_SSCALED, + B8G8R8A8_UINT, + B8G8R8A8_SINT, + B8G8R8A8_SRGB, + A8B8G8R8_UNORM_PACK32, + A8B8G8R8_SNORM_PACK32, + A8B8G8R8_USCALED_PACK32, + A8B8G8R8_SSCALED_PACK32, + A8B8G8R8_UINT_PACK32, + A8B8G8R8_SINT_PACK32, + A8B8G8R8_SRGB_PACK32, + A2R10G10B10_UNORM_PACK32, + A2R10G10B10_SNORM_PACK32, + A2R10G10B10_USCALED_PACK32, + A2R10G10B10_SSCALED_PACK32, + A2R10G10B10_UINT_PACK32, + A2R10G10B10_SINT_PACK32, + A2B10G10R10_UNORM_PACK32, + A2B10G10R10_SNORM_PACK32, + A2B10G10R10_USCALED_PACK32, + A2B10G10R10_SSCALED_PACK32, + A2B10G10R10_UINT_PACK32, + A2B10G10R10_SINT_PACK32, + R16_UNORM, + R16_SNORM, + R16_USCALED, + R16_SSCALED, + R16_UINT, + R16_SINT, + R16_SFLOAT, + R16G16_UNORM, + R16G16_SNORM, + R16G16_USCALED, + R16G16_SSCALED, + R16G16_UINT, + R16G16_SINT, + R16G16_SFLOAT, + R16G16B16_UNORM, + R16G16B16_SNORM, + R16G16B16_USCALED, + R16G16B16_SSCALED, + R16G16B16_UINT, + R16G16B16_SINT, + R16G16B16_SFLOAT, + R16G16B16A16_UNORM, + R16G16B16A16_SNORM, + R16G16B16A16_USCALED, + R16G16B16A16_SSCALED, + R16G16B16A16_UINT, + R16G16B16A16_SINT, + R16G16B16A16_SFLOAT, + R32_UINT, + R32_SINT, + R32_SFLOAT, + R32G32_UINT, + R32G32_SINT, + R32G32_SFLOAT, + R32G32B32_UINT, + R32G32B32_SINT, + R32G32B32_SFLOAT, + R32G32B32A32_UINT, + R32G32B32A32_SINT, + R32G32B32A32_SFLOAT, + R64_UINT, + R64_SINT, + R64_SFLOAT, + R64G64_UINT, + R64G64_SINT, + R64G64_SFLOAT, + R64G64B64_UINT, + R64G64B64_SINT, + R64G64B64_SFLOAT, + R64G64B64A64_UINT, + R64G64B64A64_SINT, + R64G64B64A64_SFLOAT, + B10G11R11_UFLOAT_PACK32, + E5B9G9R9_UFLOAT_PACK32, + D16_UNORM, + X8_D24_UNORM_PACK32, + D32_SFLOAT, + S8_UINT, + D16_UNORM_S8_UINT, + D24_UNORM_S8_UINT, + D32_SFLOAT_S8_UINT, + BC1_RGB_UNORM_BLOCK, + BC1_RGB_SRGB_BLOCK, + BC1_RGBA_UNORM_BLOCK, + BC1_RGBA_SRGB_BLOCK, + BC2_UNORM_BLOCK, + BC2_SRGB_BLOCK, + BC3_UNORM_BLOCK, + BC3_SRGB_BLOCK, + BC4_UNORM_BLOCK, + BC4_SNORM_BLOCK, + BC5_UNORM_BLOCK, + BC5_SNORM_BLOCK, + BC6H_UFLOAT_BLOCK, + BC6H_SFLOAT_BLOCK, + BC7_UNORM_BLOCK, + BC7_SRGB_BLOCK, + ETC2_R8G8B8_UNORM_BLOCK, + ETC2_R8G8B8_SRGB_BLOCK, + ETC2_R8G8B8A1_UNORM_BLOCK, + ETC2_R8G8B8A1_SRGB_BLOCK, + ETC2_R8G8B8A8_UNORM_BLOCK, + ETC2_R8G8B8A8_SRGB_BLOCK, + EAC_R11_UNORM_BLOCK, + EAC_R11_SNORM_BLOCK, + EAC_R11G11_UNORM_BLOCK, + EAC_R11G11_SNORM_BLOCK, + ASTC_4x4_UNORM_BLOCK, + ASTC_4x4_SRGB_BLOCK, + ASTC_5x4_UNORM_BLOCK, + ASTC_5x4_SRGB_BLOCK, + ASTC_5x5_UNORM_BLOCK, + ASTC_5x5_SRGB_BLOCK, + ASTC_6x5_UNORM_BLOCK, + ASTC_6x5_SRGB_BLOCK, + ASTC_6x6_UNORM_BLOCK, + ASTC_6x6_SRGB_BLOCK, + ASTC_8x5_UNORM_BLOCK, + ASTC_8x5_SRGB_BLOCK, + ASTC_8x6_UNORM_BLOCK, + ASTC_8x6_SRGB_BLOCK, + ASTC_8x8_UNORM_BLOCK, + ASTC_8x8_SRGB_BLOCK, + ASTC_10x5_UNORM_BLOCK, + ASTC_10x5_SRGB_BLOCK, + ASTC_10x6_UNORM_BLOCK, + ASTC_10x6_SRGB_BLOCK, + ASTC_10x8_UNORM_BLOCK, + ASTC_10x8_SRGB_BLOCK, + ASTC_10x10_UNORM_BLOCK, + ASTC_10x10_SRGB_BLOCK, + ASTC_12x10_UNORM_BLOCK, + ASTC_12x10_SRGB_BLOCK, + ASTC_12x12_UNORM_BLOCK, + ASTC_12x12_SRGB_BLOCK, + G8B8G8R8_422_UNORM, + B8G8R8G8_422_UNORM, + G8_B8_R8_3PLANE_420_UNORM, + G8_B8R8_2PLANE_420_UNORM, + G8_B8_R8_3PLANE_422_UNORM, + G8_B8R8_2PLANE_422_UNORM, + G8_B8_R8_3PLANE_444_UNORM, + R10X6_UNORM_PACK16, + R10X6G10X6_UNORM_2PACK16, + R10X6G10X6B10X6A10X6_UNORM_4PACK16, + G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, + B10X6G10X6R10X6G10X6_422_UNORM_4PACK16, + G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16, + G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16, + G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16, + G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16, + G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16, + R12X4_UNORM_PACK16, + R12X4G12X4_UNORM_2PACK16, + R12X4G12X4B12X4A12X4_UNORM_4PACK16, + G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, + B12X4G12X4R12X4G12X4_422_UNORM_4PACK16, + G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16, + G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16, + G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16, + G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16, + G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16, + G16B16G16R16_422_UNORM, + B16G16R16G16_422_UNORM, + G16_B16_R16_3PLANE_420_UNORM, + G16_B16R16_2PLANE_420_UNORM, + G16_B16_R16_3PLANE_422_UNORM, + G16_B16R16_2PLANE_422_UNORM, + G16_B16_R16_3PLANE_444_UNORM, + }; + class RenderDriver; struct RenderDevice; + struct VertexAttribute; + struct VertexBinding; struct GraphicsPipelineParams; struct ComputePipelineParams; diff --git a/engine/include/nova/render/render_params.h b/engine/include/nova/render/render_params.h index 2b3629c..b862cf8 100644 --- a/engine/include/nova/render/render_params.h +++ b/engine/include/nova/render/render_params.h @@ -10,13 +10,26 @@ #include #include +#include namespace Nova { + struct VertexAttribute { + u32 binding = 0; + u32 location = 0; + u32 offset = 0; + DataFormat format = DataFormat::R32G32B32_SFLOAT; + }; + + struct VertexBinding { + u32 binding = 0; + u32 stride = 0; + InputRate rate = InputRate::VERTEX; + }; + struct GraphicsPipelineParams { std::unordered_map shaders; - - // TODO: Vertex input state - + std::vector bindings; + std::vector attributes; PrimitiveTopology topology = PrimitiveTopology::TRIANGLE_LIST; // TODO: Tessellation state diff --git a/engine/src/drivers/vulkan/render_driver.cpp b/engine/src/drivers/vulkan/render_driver.cpp index c440f98..4fcc053 100644 --- a/engine/src/drivers/vulkan/render_driver.cpp +++ b/engine/src/drivers/vulkan/render_driver.cpp @@ -24,8 +24,6 @@ using namespace Nova; -// clang-format off - static constexpr VkShaderStageFlagBits VK_SHADER_STAGE_MAP[] = { VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_FRAGMENT_BIT, @@ -45,6 +43,8 @@ static constexpr VkPrimitiveTopology VK_PRIMITIVE_TOPOLOGY_MAP[] = { VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP }; +// clang-format off + static constexpr VkCullModeFlags VK_CULL_MODE_MAP[] = { VK_CULL_MODE_NONE, VK_CULL_MODE_FRONT_BIT, @@ -56,8 +56,235 @@ static constexpr VkFrontFace VK_FRONT_FACE_MAP[] = { VK_FRONT_FACE_CLOCKWISE }; +static constexpr VkVertexInputRate VK_VERTEX_INPUT_RATE_MAP[] = { + VK_VERTEX_INPUT_RATE_VERTEX, + VK_VERTEX_INPUT_RATE_INSTANCE +}; + // clang-format on +static constexpr VkFormat VK_FORMAT_MAP[] = { + VK_FORMAT_UNDEFINED, + VK_FORMAT_R4G4_UNORM_PACK8, + VK_FORMAT_R4G4B4A4_UNORM_PACK16, + VK_FORMAT_B4G4R4A4_UNORM_PACK16, + VK_FORMAT_R5G6B5_UNORM_PACK16, + VK_FORMAT_B5G6R5_UNORM_PACK16, + VK_FORMAT_R5G5B5A1_UNORM_PACK16, + VK_FORMAT_B5G5R5A1_UNORM_PACK16, + VK_FORMAT_A1R5G5B5_UNORM_PACK16, + VK_FORMAT_R8_UNORM, + VK_FORMAT_R8_SNORM, + VK_FORMAT_R8_USCALED, + VK_FORMAT_R8_SSCALED, + VK_FORMAT_R8_UINT, + VK_FORMAT_R8_SINT, + VK_FORMAT_R8_SRGB, + VK_FORMAT_R8G8_UNORM, + VK_FORMAT_R8G8_SNORM, + VK_FORMAT_R8G8_USCALED, + VK_FORMAT_R8G8_SSCALED, + VK_FORMAT_R8G8_UINT, + VK_FORMAT_R8G8_SINT, + VK_FORMAT_R8G8_SRGB, + VK_FORMAT_R8G8B8_UNORM, + VK_FORMAT_R8G8B8_SNORM, + VK_FORMAT_R8G8B8_USCALED, + VK_FORMAT_R8G8B8_SSCALED, + VK_FORMAT_R8G8B8_UINT, + VK_FORMAT_R8G8B8_SINT, + VK_FORMAT_R8G8B8_SRGB, + VK_FORMAT_B8G8R8_UNORM, + VK_FORMAT_B8G8R8_SNORM, + VK_FORMAT_B8G8R8_USCALED, + VK_FORMAT_B8G8R8_SSCALED, + VK_FORMAT_B8G8R8_UINT, + VK_FORMAT_B8G8R8_SINT, + VK_FORMAT_B8G8R8_SRGB, + VK_FORMAT_R8G8B8A8_UNORM, + VK_FORMAT_R8G8B8A8_SNORM, + VK_FORMAT_R8G8B8A8_USCALED, + VK_FORMAT_R8G8B8A8_SSCALED, + VK_FORMAT_R8G8B8A8_UINT, + VK_FORMAT_R8G8B8A8_SINT, + VK_FORMAT_R8G8B8A8_SRGB, + VK_FORMAT_B8G8R8A8_UNORM, + VK_FORMAT_B8G8R8A8_SNORM, + VK_FORMAT_B8G8R8A8_USCALED, + VK_FORMAT_B8G8R8A8_SSCALED, + VK_FORMAT_B8G8R8A8_UINT, + VK_FORMAT_B8G8R8A8_SINT, + VK_FORMAT_B8G8R8A8_SRGB, + VK_FORMAT_A8B8G8R8_UNORM_PACK32, + VK_FORMAT_A8B8G8R8_SNORM_PACK32, + VK_FORMAT_A8B8G8R8_USCALED_PACK32, + VK_FORMAT_A8B8G8R8_SSCALED_PACK32, + VK_FORMAT_A8B8G8R8_UINT_PACK32, + VK_FORMAT_A8B8G8R8_SINT_PACK32, + VK_FORMAT_A8B8G8R8_SRGB_PACK32, + VK_FORMAT_A2R10G10B10_UNORM_PACK32, + VK_FORMAT_A2R10G10B10_SNORM_PACK32, + VK_FORMAT_A2R10G10B10_USCALED_PACK32, + VK_FORMAT_A2R10G10B10_SSCALED_PACK32, + VK_FORMAT_A2R10G10B10_UINT_PACK32, + VK_FORMAT_A2R10G10B10_SINT_PACK32, + VK_FORMAT_A2B10G10R10_UNORM_PACK32, + VK_FORMAT_A2B10G10R10_SNORM_PACK32, + VK_FORMAT_A2B10G10R10_USCALED_PACK32, + VK_FORMAT_A2B10G10R10_SSCALED_PACK32, + VK_FORMAT_A2B10G10R10_UINT_PACK32, + VK_FORMAT_A2B10G10R10_SINT_PACK32, + VK_FORMAT_R16_UNORM, + VK_FORMAT_R16_SNORM, + VK_FORMAT_R16_USCALED, + VK_FORMAT_R16_SSCALED, + VK_FORMAT_R16_UINT, + VK_FORMAT_R16_SINT, + VK_FORMAT_R16_SFLOAT, + VK_FORMAT_R16G16_UNORM, + VK_FORMAT_R16G16_SNORM, + VK_FORMAT_R16G16_USCALED, + VK_FORMAT_R16G16_SSCALED, + VK_FORMAT_R16G16_UINT, + VK_FORMAT_R16G16_SINT, + VK_FORMAT_R16G16_SFLOAT, + VK_FORMAT_R16G16B16_UNORM, + VK_FORMAT_R16G16B16_SNORM, + VK_FORMAT_R16G16B16_USCALED, + VK_FORMAT_R16G16B16_SSCALED, + VK_FORMAT_R16G16B16_UINT, + VK_FORMAT_R16G16B16_SINT, + VK_FORMAT_R16G16B16_SFLOAT, + VK_FORMAT_R16G16B16A16_UNORM, + VK_FORMAT_R16G16B16A16_SNORM, + VK_FORMAT_R16G16B16A16_USCALED, + VK_FORMAT_R16G16B16A16_SSCALED, + VK_FORMAT_R16G16B16A16_UINT, + VK_FORMAT_R16G16B16A16_SINT, + VK_FORMAT_R16G16B16A16_SFLOAT, + VK_FORMAT_R32_UINT, + VK_FORMAT_R32_SINT, + VK_FORMAT_R32_SFLOAT, + VK_FORMAT_R32G32_UINT, + VK_FORMAT_R32G32_SINT, + VK_FORMAT_R32G32_SFLOAT, + VK_FORMAT_R32G32B32_UINT, + VK_FORMAT_R32G32B32_SINT, + VK_FORMAT_R32G32B32_SFLOAT, + VK_FORMAT_R32G32B32A32_UINT, + VK_FORMAT_R32G32B32A32_SINT, + VK_FORMAT_R32G32B32A32_SFLOAT, + VK_FORMAT_R64_UINT, + VK_FORMAT_R64_SINT, + VK_FORMAT_R64_SFLOAT, + VK_FORMAT_R64G64_UINT, + VK_FORMAT_R64G64_SINT, + VK_FORMAT_R64G64_SFLOAT, + VK_FORMAT_R64G64B64_UINT, + VK_FORMAT_R64G64B64_SINT, + VK_FORMAT_R64G64B64_SFLOAT, + VK_FORMAT_R64G64B64A64_UINT, + VK_FORMAT_R64G64B64A64_SINT, + VK_FORMAT_R64G64B64A64_SFLOAT, + VK_FORMAT_B10G11R11_UFLOAT_PACK32, + VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, + VK_FORMAT_D16_UNORM, + VK_FORMAT_X8_D24_UNORM_PACK32, + VK_FORMAT_D32_SFLOAT, + VK_FORMAT_S8_UINT, + VK_FORMAT_D16_UNORM_S8_UINT, + VK_FORMAT_D24_UNORM_S8_UINT, + VK_FORMAT_D32_SFLOAT_S8_UINT, + VK_FORMAT_BC1_RGB_UNORM_BLOCK, + VK_FORMAT_BC1_RGB_SRGB_BLOCK, + VK_FORMAT_BC1_RGBA_UNORM_BLOCK, + VK_FORMAT_BC1_RGBA_SRGB_BLOCK, + VK_FORMAT_BC2_UNORM_BLOCK, + VK_FORMAT_BC2_SRGB_BLOCK, + VK_FORMAT_BC3_UNORM_BLOCK, + VK_FORMAT_BC3_SRGB_BLOCK, + VK_FORMAT_BC4_UNORM_BLOCK, + VK_FORMAT_BC4_SNORM_BLOCK, + VK_FORMAT_BC5_UNORM_BLOCK, + VK_FORMAT_BC5_SNORM_BLOCK, + VK_FORMAT_BC6H_UFLOAT_BLOCK, + VK_FORMAT_BC6H_SFLOAT_BLOCK, + VK_FORMAT_BC7_UNORM_BLOCK, + VK_FORMAT_BC7_SRGB_BLOCK, + VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK, + VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK, + VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK, + VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK, + VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK, + VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK, + VK_FORMAT_EAC_R11_UNORM_BLOCK, + VK_FORMAT_EAC_R11_SNORM_BLOCK, + VK_FORMAT_EAC_R11G11_UNORM_BLOCK, + VK_FORMAT_EAC_R11G11_SNORM_BLOCK, + VK_FORMAT_ASTC_4x4_UNORM_BLOCK, + VK_FORMAT_ASTC_4x4_SRGB_BLOCK, + VK_FORMAT_ASTC_5x4_UNORM_BLOCK, + VK_FORMAT_ASTC_5x4_SRGB_BLOCK, + VK_FORMAT_ASTC_5x5_UNORM_BLOCK, + VK_FORMAT_ASTC_5x5_SRGB_BLOCK, + VK_FORMAT_ASTC_6x5_UNORM_BLOCK, + VK_FORMAT_ASTC_6x5_SRGB_BLOCK, + VK_FORMAT_ASTC_6x6_UNORM_BLOCK, + VK_FORMAT_ASTC_6x6_SRGB_BLOCK, + VK_FORMAT_ASTC_8x5_UNORM_BLOCK, + VK_FORMAT_ASTC_8x5_SRGB_BLOCK, + VK_FORMAT_ASTC_8x6_UNORM_BLOCK, + VK_FORMAT_ASTC_8x6_SRGB_BLOCK, + VK_FORMAT_ASTC_8x8_UNORM_BLOCK, + VK_FORMAT_ASTC_8x8_SRGB_BLOCK, + VK_FORMAT_ASTC_10x5_UNORM_BLOCK, + VK_FORMAT_ASTC_10x5_SRGB_BLOCK, + VK_FORMAT_ASTC_10x6_UNORM_BLOCK, + VK_FORMAT_ASTC_10x6_SRGB_BLOCK, + VK_FORMAT_ASTC_10x8_UNORM_BLOCK, + VK_FORMAT_ASTC_10x8_SRGB_BLOCK, + VK_FORMAT_ASTC_10x10_UNORM_BLOCK, + VK_FORMAT_ASTC_10x10_SRGB_BLOCK, + VK_FORMAT_ASTC_12x10_UNORM_BLOCK, + VK_FORMAT_ASTC_12x10_SRGB_BLOCK, + VK_FORMAT_ASTC_12x12_UNORM_BLOCK, + VK_FORMAT_ASTC_12x12_SRGB_BLOCK, + VK_FORMAT_G8B8G8R8_422_UNORM, + VK_FORMAT_B8G8R8G8_422_UNORM, + VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, + VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, + VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM, + VK_FORMAT_G8_B8R8_2PLANE_422_UNORM, + VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM, + VK_FORMAT_R10X6_UNORM_PACK16, + VK_FORMAT_R10X6G10X6_UNORM_2PACK16, + VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16, + VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, + VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16, + VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16, + VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16, + VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16, + VK_FORMAT_R12X4_UNORM_PACK16, + VK_FORMAT_R12X4G12X4_UNORM_2PACK16, + VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, + VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, + VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16, + VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16, + VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16, + VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16, + VK_FORMAT_G16B16G16R16_422_UNORM, + VK_FORMAT_B16G16R16G16_422_UNORM, + VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, + VK_FORMAT_G16_B16R16_2PLANE_420_UNORM, + VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, + VK_FORMAT_G16_B16R16_2PLANE_422_UNORM, + VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM +}; + VulkanRenderDriver::VulkanRenderDriver(WindowDriver* p_driver) : m_window_driver(p_driver) { NOVA_AUTO_TRACE(); _check_version(); @@ -370,11 +597,29 @@ PipelineID VulkanRenderDriver::create_pipeline(GraphicsPipelineParams& p_params) shader_stages.push_back(stage_create); } - // TODO: Properly set up vertex input state + std::vector vertex_bindings; + std::vector vertex_attributes; + for (const auto& binding : p_params.bindings) { + VkVertexInputBindingDescription binding_desc {}; + binding_desc.binding = binding.binding; + binding_desc.stride = binding.stride; + binding_desc.inputRate = VK_VERTEX_INPUT_RATE_MAP[static_cast(binding.rate)]; + vertex_bindings.push_back(binding_desc); + } + for (const auto& attribute : p_params.attributes) { + VkVertexInputAttributeDescription attribute_desc {}; + attribute_desc.binding = attribute.binding; + attribute_desc.location = attribute.location; + attribute_desc.format = VK_FORMAT_MAP[static_cast(attribute.format)]; + attribute_desc.offset = attribute.offset; + vertex_attributes.push_back(attribute_desc); + } VkPipelineVertexInputStateCreateInfo vertex_input {}; vertex_input.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; - vertex_input.vertexBindingDescriptionCount = 0; - vertex_input.vertexAttributeDescriptionCount = 0; + vertex_input.vertexBindingDescriptionCount = static_cast(vertex_bindings.size()); + vertex_input.pVertexBindingDescriptions = vertex_bindings.data(); + vertex_input.vertexAttributeDescriptionCount = static_cast(vertex_attributes.size()); + vertex_input.pVertexAttributeDescriptions = vertex_attributes.data(); VkPipelineInputAssemblyStateCreateInfo input_assembly {}; input_assembly.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;