Ensure correct alignment for buffer writes

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -2130,6 +2130,7 @@ void GLShader::PostProcessUniforms() {
 		size = components ? PAD( size, 4 ) * components : size;
 		GLuint alignmentConsume = 4 - size % 4;
 
+		GLUniform* tmpUniform = _materialSystemUniforms[0];
 		tmp.emplace_back( _materialSystemUniforms[0] );
 		_materialSystemUniforms.erase( _materialSystemUniforms.begin() );
 
@@ -2138,10 +2139,16 @@ void GLShader::PostProcessUniforms() {
 			&& ( uniform = FindUniformForAlignment( _materialSystemUniforms, alignmentConsume ) ) != -1 ) {
 			alignmentConsume -= _materialSystemUniforms[uniform]->GetSTD430Size();
 
+			tmpUniform = _materialSystemUniforms[uniform];
+
 			tmp.emplace_back( _materialSystemUniforms[uniform] );
 			_materialSystemUniforms.erase( _materialSystemUniforms.begin() + uniform );
 		}
 
+		if ( alignmentConsume ) {
+			tmpUniform->SetSTD430Size( tmpUniform->GetSTD430Size() + alignmentConsume );
+		}
+
 		size = PAD( size, 4 );
 		std430Size += size;
 		padding = alignmentConsume;

src/engine/renderer/gl_shader.h

@@ -414,7 +414,7 @@ class GLUniform
 	const std::string _type;
 
 	// In multiples of 4 bytes
-	const GLuint _std430Size;
+	GLuint _std430Size;
 	const GLuint _std430Alignment;
 
 	const bool _global; // This uniform won't go into the materials UBO if true
@@ -460,6 +460,10 @@ class GLUniform
 		return _type;
 	}
 
+	void SetSTD430Size( const GLuint size ) {
+		_std430Size = size;
+	}
+
 	GLuint GetSTD430Size() const;
 
 	GLuint GetSTD430Alignment() const;
@@ -525,15 +529,13 @@ class GLUniformSampler : protected GLUniform {
 	}
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
-		uint32_t* bufferNext = buffer;
 		if ( glConfig2.usingBindlessTextures ) {
 			memcpy( buffer, &currentValueBindless, sizeof( GLuint64 ) );
-			bufferNext += 2;
 		} else {
 			memcpy( buffer, &currentValue, sizeof( GLint ) );
-			bufferNext += 1;
 		}
-		return bufferNext;
+
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -692,7 +694,7 @@ class GLUniform1i : protected GLUniform
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( int ) );
-		return buffer + 1;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -735,7 +737,7 @@ class GLUniform1ui : protected GLUniform {
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( uint ) );
-		return buffer + 1;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -780,7 +782,7 @@ class GLUniform1Bool : protected GLUniform {
 
 	uint32_t* WriteToBuffer( uint32_t *buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( bool ) );
-		return buffer + 1;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -828,7 +830,7 @@ class GLUniform1f : protected GLUniform
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( float ) );
-		return buffer + 1;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -862,7 +864,7 @@ class GLUniform1fv : protected GLUniform
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, currentValue.data(), currentValue.size() * sizeof( float ) );
-		return buffer + _components;
+		return buffer + _components * _std430Size;
 	}
 
 	private:
@@ -913,7 +915,7 @@ class GLUniform2f : protected GLUniform
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( vec2_t ) );
-		return buffer + 2;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -964,7 +966,7 @@ class GLUniform3f : protected GLUniform
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( vec3_t ) );
-		return buffer + 3;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -1016,7 +1018,7 @@ class GLUniform4f : protected GLUniform
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( vec4_t ) );
-		return buffer + 4;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -1051,7 +1053,7 @@ class GLUniform4fv : protected GLUniform
 	public:
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, currentValue.data(), currentValue.size() * sizeof( float ) );
-		return buffer + 4 * _components;
+		return buffer + _std430Size * _components;
 	}
 
 	private:
@@ -1100,7 +1102,7 @@ class GLUniformMatrix4f : protected GLUniform
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, &currentValue, sizeof( matrix_t ) );
-		return buffer + 16;
+		return buffer + _std430Size;
 	}
 
 	private:
@@ -1134,7 +1136,7 @@ class GLUniformMatrix32f : protected GLUniform {
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, currentValue, 6 * sizeof( float ) );
-		return buffer + 6 * _components;
+		return buffer + _std430Size * _components;
 	}
 
 	private:
@@ -1169,7 +1171,7 @@ class GLUniformMatrix4fv : protected GLUniform
 	public:
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, currentValue.data(), currentValue.size() * sizeof( float ) );
-		return buffer + 16 * _components;
+		return buffer + _std430Size * _components;
 	}
 
 	private:
@@ -1203,7 +1205,7 @@ class GLUniformMatrix34fv : protected GLUniform
 	public:
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {
 		memcpy( buffer, currentValue.data(), currentValue.size() * sizeof( float ) );
-		return buffer + 12 * _components;
+		return buffer + _std430Size * _components;
 	}
 
 	private: