color

Author: illwieckz

src/engine/renderer/gl_shader.h

@@ -3063,14 +3063,19 @@ class u_Color :
 };
 
 class u_ColorGlobal :
-	GLUniform1ui {
+	GLUniform1i {
 	public:
 	u_ColorGlobal( GLShader* shader ) :
-		GLUniform1ui( shader, "u_ColorGlobal", true ) {
+		GLUniform1i( shader, "u_ColorGlobal", true ) {
 	}
 
 	void SetUniform_ColorGlobal( const Color::Color& color ) {
-		this->SetValue( packUnorm4x8( color.ToArray() ) );
+		/* HACK: Store uint32_t as int32_t to be compatible with GLSL 1.20,
+		the GLSL code will convert back to uint32_t. */
+		uint32_t uColor = packUnorm4x8( color.ToArray() );
+		int32_t iColor;
+		memcpy( &iColor, &uColor, sizeof( iColor ) );
+		this->SetValue( iColor );
 	}
 };