(Shaders) Added vertices align.

Author: Monika0000

inc/Utils/Common/Vertices.h

@@ -96,6 +96,7 @@ namespace SR_UTILS_NS {
         uint8_t count = 0;
         uint16_t offset = 0;
 
+        SR_NODISCARD static uint8_t GetAttributeSizeInBytes(VertexAttributeFormat format, uint8_t count);
         SR_NODISCARD uint8_t GetAttributeSizeInBytes() const;
     };
 
@@ -104,14 +105,14 @@ namespace SR_UTILS_NS {
     struct VertexLayoutDescription {
         VertexAttributeDescription attributes[SR_MAX_VERTEX_ATTRIBUTES] = {};
         uint8_t attributesCount = 0;
+        uint64_t stride = 0;
 
-        mutable uint64_t strideCache = 0;
-
+        SR_NODISCARD static uint32_t Align(uint32_t v, uint32_t a);
         SR_NODISCARD bool Compare(const VertexLayoutDescription& other) const;
 
         void Reset() {
             attributesCount = 0;
-            strideCache = 0;
+            stride = 0;
             memset(attributes, 0, sizeof(attributes));
         }
 

src/Utils/Common/Vertices.cpp

@@ -158,22 +158,21 @@ namespace SR_UTILS_NS {
     }
 
     uint8_t VertexAttributeDescription::GetAttributeSizeInBytes() const {
+        return GetAttributeSizeInBytes(format, count);
+    }
+
+    uint8_t VertexAttributeDescription::GetAttributeSizeInBytes(VertexAttributeFormat format, uint8_t count) {
         // Для packed форматов count игнорируем, так как они уже 32-битные
         if (format == VertexAttributeFormat::R10G10B10A2_UNorm || format == VertexAttributeFormat::R11G11B10_Float) {
             return 4;
         }
 
-        return GetVertexAttributeFormatSize(format) * count;
+        const uint8_t size = GetVertexAttributeFormatSize(format) * count;
+        return size == 12 ? 16 : size; // GPU slot rule
     }
 
     uint64_t VertexLayoutDescription::GetStride() const {
-        if (strideCache != 0) {
-            return strideCache;
-        }
-        for (uint8_t i = 0; i < attributesCount; ++i) {
-            strideCache += attributes[i].GetAttributeSizeInBytes() * attributes[i].count;
-        }
-        return strideCache;
+        return stride;
     }
 
     const VertexAttributeDescription* VertexLayoutDescription::Find(VertexAttribute attribute) const {
@@ -185,15 +184,26 @@ namespace SR_UTILS_NS {
         return nullptr;
     }
 
+    uint32_t VertexLayoutDescription::Align(uint32_t v, uint32_t a) {
+        return (v + a - 1) & ~(a - 1);
+    }
+
     VertexLayoutDescription& VertexLayoutDescription::AddAttribute(VertexAttribute attribute, VertexAttributeFormat format, uint8_t count) {
         if (attributesCount >= SR_MAX_VERTEX_ATTRIBUTES) {
             SRHalt("VertexLayoutDescription::AddAttribute() : maximum vertex attributes count exceeded! Max count: {}", SR_MAX_VERTEX_ATTRIBUTES);
             return *this;
         }
-        const uint64_t offset = GetStride();
+
+        uint32_t offset = stride;
+
+        // GPU-safe alignment
+        offset = Align(offset, 16);
         SRAssert(offset < std::numeric_limits<uint16_t>::max());
-        attributes[attributesCount++] = VertexAttributeDescription{ attribute, format, count, static_cast<uint16_t>(offset) };
-        strideCache = 0;
+
+        uint32_t size = VertexAttributeDescription::GetAttributeSizeInBytes(format, count);
+        attributes[attributesCount++] = VertexAttributeDescription{ attribute, format, count, (uint16_t)offset };
+
+        stride = offset + size;
         return *this;
     }