From 85200db6a21b57d9ee7e4d325553f40b90a5a37d Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 15 Jan 2013 12:25:06 +0100 Subject: [PATCH] Revert "fix byte order in osd rasterfont" This reverts commit db5f4c8c20b36b2fdc6257104096e021b56d6145. Conflicts: Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp --- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 2bc7af06d5..3d443f13db 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -276,7 +276,7 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta ProgramShaderCache::SetBothShaders(s_fragmentShader.glprogid, s_vertexShader.glprogid); if(color != cached_color) { - glUniform4f(uniform_color_id, GLfloat((color>>0)&0xff)/255.f,GLfloat((color>>8)&0xff)/255.f,GLfloat((color>>16)&0xff)/255.f,GLfloat((color>>24)&0xff)/255.f); + glUniform4f(uniform_color_id, GLfloat((color>>16)&0xff)/255.f,GLfloat((color>>8)&0xff)/255.f,GLfloat((color>>0)&0xff)/255.f,GLfloat((color>>24)&0xff)/255.f); cached_color = color; }