Add GLUniform.bufferSize as a shorthand for _std430Size * max( 1, _components )

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -1286,8 +1286,7 @@ void GLShaderManager::InitShader( GLShader* shader ) {
 		uniform->SetLocationIndex( i );
 		uniform->SetUniformStorageOffset( shader->_uniformStorageSize );
 
-		const uint32_t size = uniform->_components ? uniform->_std430Size * uniform->_components : uniform->_std430Size;
-		shader->_uniformStorageSize += size;
+		shader->_uniformStorageSize += uniform->_bufferSize;
 	}
 
 	shader->_uniformStorageSize *= sizeof( uint32_t );

src/engine/renderer/gl_shader.h

@@ -344,6 +344,7 @@ class GLUniform {
 	// FIXME: the uniform structs are actually std140 so it would be more relevant to provide std140 info
 	const GLuint _std430BaseSize;
 	const GLuint _std430Alignment;
+	const GLuint _bufferSize;
 	GLuint _nextUniformOffset;
 
 	const UpdateType _updateType;
@@ -364,6 +365,7 @@ class GLUniform {
 		_std430BaseSize( std430Size ),
 		_std430Size( std430Size ),
 		_std430Alignment( std430Alignment ),
+		_bufferSize( components ? components * 4 : std430Size ),
 		_nextUniformOffset( components ? components * 4 : std430Size ),
 		_updateType( updateType ),
 		_components( components ),
@@ -388,11 +390,10 @@ class GLUniform {
 			currentValue = p->uniformStorage + _uniformStorageOffset;
 		}
 
-		const uint32_t size = _components ? _std430Size * _components : _std430Size;
-		const bool updated = memcmp( currentValue, value, size * sizeof( uint32_t ) );
+		const bool updated = memcmp( currentValue, value, _bufferSize * sizeof( uint32_t ) );
 
 		if ( updated ) {
-			memcpy( currentValue, value, size * sizeof( uint32_t ) );
+			memcpy( currentValue, value, _bufferSize * sizeof( uint32_t ) );
 			_shader->uniformsUpdated = true;
 		}
 
@@ -423,8 +424,7 @@ class GLUniform {
 			return buffer;
 		}
 
-		const uint32_t size = _components ? _std430Size * _components : _std430Size;
-		memcpy( buffer, currentValue, size * sizeof( uint32_t ) );
+		memcpy( buffer, currentValue, _bufferSize * sizeof( uint32_t ) );
 
 		return buffer + _nextUniformOffset;
 	}