Material uniform packing: add back arrays

Author: slipher

src/engine/renderer/gl_shader.cpp

@@ -2136,12 +2136,17 @@ void GLShader::PostProcessUniforms() {
 		auto iterNext = FindUniformForOffset( uniformQueue, std140Size );
 		if ( iterNext == uniformQueue.end() ) {
 			// add 1 unit of padding
+			ASSERT( !( *iterNext )->_components ); // array WriteToBuffer impls don't handle padding correctly
 			++std140Size;
 			++_materialSystemUniforms.back()->_std430Size;
 		} else {
-			ASSERT_EQ( 0, ( *iterNext )->_components ); // array handling not implemented
 			( *iterNext )->_std430Size = ( *iterNext )->_std430BaseSize;
-			std140Size += ( *iterNext )->_std430Size;
+			if ( ( *iterNext )->_components ) {
+				ASSERT_GE( ( *iterNext )->_std430Alignment, 4 ); // these would need extra padding in a std130 array
+				std140Size += ( *iterNext )->_std430Size * ( *iterNext )->_components;
+			} else {
+				std140Size += ( *iterNext )->_std430Size;
+			}
 			align = std::max( align, ( *iterNext )->_std430Alignment );
 			_materialSystemUniforms.push_back( *iterNext );
 			uniformQueue.erase( iterNext );

src/engine/renderer/gl_shader_test.cpp

@@ -122,4 +122,21 @@ TEST(MaterialUniformPackingTest, Vec3Handling)
     EXPECT_EQ(uniforms[3]->_std430Size, 4u);
 }
 
+TEST(MaterialUniformPackingTest, Array)
+{
+    class Shader1 : public MaterialUniformPackingTestShaderBase,
+                    public u_Frustum //vec4[6]
+    {
+    public:
+        Shader1() : u_Frustum(this) {}
+    };
+
+    Shader1 shader1;
+    std::vector<GLUniform*> uniforms = shader1.GetUniforms();
+    EXPECT_EQ(shader1.GetSTD140Size(), 24u);
+    ASSERT_EQ(uniforms.size(), 1);
+    EXPECT_EQ(uniforms[0], Get<u_Frustum>(shader1));
+    EXPECT_EQ(uniforms[0]->_std430Size, 4u);
+}
+
 } // namespace