Add back padding to material uniforms struct

Author: slipher

src/engine/renderer/gl_shader.cpp

@@ -1547,6 +1547,7 @@ std::string GLShaderManager::RemoveUniformsFromShaderText( const std::string& sh
 
 void GLShaderManager::GenerateUniformStructDefinesText( const std::vector<GLUniform*>& uniforms,
 	const std::string& definesName, std::string& uniformStruct, std::string& uniformDefines ) {
+	int pad = 0;
 	for ( GLUniform* uniform : uniforms ) {
 		uniformStruct += "	" + ( uniform->_isTexture ? "uvec2" : uniform->_type ) + " " + uniform->_name;
 
@@ -1555,6 +1556,10 @@ void GLShaderManager::GenerateUniformStructDefinesText( const std::vector<GLUnif
 		}
 		uniformStruct += ";\n";
 
+		for (int p = uniform->_std430Size - uniform->_std430BaseSize; p--; ) {
+			uniformStruct += "\tfloat _pad" + std::to_string( ++pad ) + ";\n";
+		}
+
 		uniformDefines += "#define ";
 		uniformDefines += uniform->_name;
 
@@ -2132,6 +2137,7 @@ void GLShader::PostProcessUniforms() {
 			++std430Size;
 			++_materialSystemUniforms.back()->_std430Size;
 		} else {
+			( *iterNext )->_std430Size = ( *iterNext )->_std430BaseSize;
 			std430Size += ( *iterNext )->_std430Size;
 			align = std::max( align, ( *iterNext )->_std430Alignment );
 			_materialSystemUniforms.push_back( *iterNext );

src/engine/renderer/gl_shader.h

@@ -317,7 +317,8 @@ class GLUniform {
 	const std::string _type;
 
 	// In multiples of 4 bytes
-	GLuint _std430Size;
+	const GLuint _std430BaseSize;
+	GLuint _std430Size; // includes padding that depends on the other uniforms in the struct
 	const GLuint _std430Alignment;
 
 	const bool _global; // This uniform won't go into the materials UBO if true
@@ -334,6 +335,7 @@ class GLUniform {
 		const bool isTexture = false ) :
 		_name( name ),
 		_type( type ),
+		_std430BaseSize( std430Size ),
 		_std430Size( std430Size ),
 		_std430Alignment( std430Alignment ),
 		_global( global ),