ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fix byte order in osd rasterfont" 

This reverts commit db5f4c8c20.

Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
This commit is contained in:
degasus 2013-01-15 12:25:06 +01:00
parent 1cfb5a21fa
commit 85200db6a2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
View File

@ -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;
}