Merge pull request #1496 from JayFoxRox/align-attribs

Align attribute components

src/common/CMakeLists.txt

@@ -22,6 +22,7 @@ set(SRCS
             )
 
 set(HEADERS
+            alignment.h
             assert.h
             bit_field.h
             bit_set.h

src/common/alignment.h

@@ -0,0 +1,22 @@
+// This file is under the public domain.
+
+#pragma once
+
+#include <cstddef>
+#include <type_traits>
+
+namespace Common {
+
+template <typename T>
+constexpr T AlignUp(T value, size_t size) {
+    static_assert(std::is_unsigned<T>::value, "T must be an unsigned value.");
+    return static_cast<T>(value + (size - value % size) % size);
+}
+
+template <typename T>
+constexpr T AlignDown(T value, size_t size) {
+    static_assert(std::is_unsigned<T>::value, "T must be an unsigned value.");
+    return static_cast<T>(value - value % size);
+}
+
+} // namespace Common

src/video_core/command_processor.cpp

@@ -5,6 +5,7 @@
 #include <cmath>
 #include <boost/range/algorithm/fill.hpp>
 
+#include "common/alignment.h"
 #include "common/microprofile.h"
 #include "common/profiler.h"
 
@@ -210,14 +211,17 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
 
                     u32 attribute_index = loader_config.GetComponent(component);
                     if (attribute_index < 12) {
+                        int element_size = attribute_config.GetElementSizeInBytes(attribute_index);
+                        load_address = Common::AlignUp(load_address, element_size);
                         vertex_attribute_sources[attribute_index] = load_address;
                         vertex_attribute_strides[attribute_index] = static_cast<u32>(loader_config.byte_count);
                         vertex_attribute_formats[attribute_index] = attribute_config.GetFormat(attribute_index);
                         vertex_attribute_elements[attribute_index] = attribute_config.GetNumElements(attribute_index);
-                        vertex_attribute_element_size[attribute_index] = attribute_config.GetElementSizeInBytes(attribute_index);
+                        vertex_attribute_element_size[attribute_index] = element_size;
                         load_address += attribute_config.GetStride(attribute_index);
                     } else if (attribute_index < 16) {
                         // Attribute ids 12, 13, 14 and 15 signify 4, 8, 12 and 16-byte paddings, respectively
+                        load_address = Common::AlignUp(load_address, 4);
                         load_address += (attribute_index - 11) * 4;
                     } else {
                         UNREACHABLE(); // This is truly unreachable due to the number of bits for each component