Merge pull request #787 from Subv/default_attributes_fallback

GPU/DefaultAttributes: Let the attribute data from the loaders overwrite the default attribs.

1 files changed, 23 insertions, 21 deletions

diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index 1ea7cad07..6121df8e3 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -74,11 +74,11 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) {
             // Information about internal vertex attributes
             u32 vertex_attribute_sources[16];
             boost::fill(vertex_attribute_sources, 0xdeadbeef);
-            u32 vertex_attribute_strides[16];
-            Regs::VertexAttributeFormat vertex_attribute_formats[16];
+            u32 vertex_attribute_strides[16] = {};
+            Regs::VertexAttributeFormat vertex_attribute_formats[16] = {};
 
-            u32 vertex_attribute_elements[16];
-            u32 vertex_attribute_element_size[16];
+            u32 vertex_attribute_elements[16] = {};
+            u32 vertex_attribute_element_size[16] = {};
 
             // Setup attribute data from loaders
             for (int loader = 0; loader < 12; ++loader) {
@@ -127,29 +127,31 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) {
                 input.attr[0].w = debug_token;
 
                 for (int i = 0; i < attribute_config.GetNumTotalAttributes(); ++i) {
+                    // Load the default attribute if we're configured to do so, this data will be overwritten by the loader data if it's set
                     if (attribute_config.IsDefaultAttribute(i)) {
                         input.attr[i] = VertexShader::GetDefaultAttribute(i);
                         LOG_TRACE(HW_GPU, "Loaded default attribute %x for vertex %x (index %x): (%f, %f, %f, %f)",
                                   i, vertex, index,
                                   input.attr[i][0].ToFloat32(), input.attr[i][1].ToFloat32(),
                                   input.attr[i][2].ToFloat32(), input.attr[i][3].ToFloat32());
-                    } else {
-                        for (unsigned int comp = 0; comp < vertex_attribute_elements[i]; ++comp) {
-                            const u8* srcdata = Memory::GetPhysicalPointer(vertex_attribute_sources[i] + vertex_attribute_strides[i] * vertex + comp * vertex_attribute_element_size[i]);
-
-                            const float srcval = (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::BYTE) ? *(s8*)srcdata :
-                                (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::UBYTE) ? *(u8*)srcdata :
-                                (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::SHORT) ? *(s16*)srcdata :
-                                *(float*)srcdata;
-
-                            input.attr[i][comp] = float24::FromFloat32(srcval);
-                            LOG_TRACE(HW_GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08lx + 0x%04lx: %f",
-                                      comp, i, vertex, index,
-                                      attribute_config.GetPhysicalBaseAddress(),
-                                      vertex_attribute_sources[i] - base_address,
-                                      vertex_attribute_strides[i] * vertex + comp * vertex_attribute_element_size[i],
-                                      input.attr[i][comp].ToFloat32());
-                        }
+                    }
+                    
+                    // Load per-vertex data from the loader arrays
+                    for (unsigned int comp = 0; comp < vertex_attribute_elements[i]; ++comp) {
+                        const u8* srcdata = Memory::GetPhysicalPointer(vertex_attribute_sources[i] + vertex_attribute_strides[i] * vertex + comp * vertex_attribute_element_size[i]);
+
+                        const float srcval = (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::BYTE) ? *(s8*)srcdata :
+                            (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::UBYTE) ? *(u8*)srcdata :
+                            (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::SHORT) ? *(s16*)srcdata :
+                            *(float*)srcdata;
+
+                        input.attr[i][comp] = float24::FromFloat32(srcval);
+                        LOG_TRACE(HW_GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08lx + 0x%04lx: %f",
+                            comp, i, vertex, index,
+                            attribute_config.GetPhysicalBaseAddress(),
+                            vertex_attribute_sources[i] - base_address,
+                            vertex_attribute_strides[i] * vertex + comp * vertex_attribute_element_size[i],
+                            input.attr[i][comp].ToFloat32());
                     }
                 }