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

fix byte order in osd rasterfont

This commit is contained in:
degasus 2013-01-07 20:11:26 +01:00
parent a1ca288555
commit b7906b49c9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,8 +212,6 @@ RasterFont::~RasterFont()
void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight, u32 color) void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight, u32 color)
{ {
size_t length = strlen(text); size_t length = strlen(text);
if (!length)
return; // nothing to do
glBindVertexArray(VAO); glBindVertexArray(VAO);
glBindBuffer(GL_ARRAY_BUFFER, VBO); glBindBuffer(GL_ARRAY_BUFFER, VBO);
@ -286,7 +284,7 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
ProgramShaderCache::SetBothShaders(s_fragmentShader.glprogid, s_vertexShader.glprogid); ProgramShaderCache::SetBothShaders(s_fragmentShader.glprogid, s_vertexShader.glprogid);
if(color != cached_color) { if(color != cached_color) {
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); 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);
cached_color = color; cached_color = color;
} }
@ -299,4 +297,4 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
glBindVertexArray(0); glBindVertexArray(0);
} }
} }