Permalink
Browse files

Merge pull request #1807 from jmarshallnz/gles_fixes

Gles fixes for texture rendering
  • Loading branch information...
2 parents 2feba99 + 9a9c384 commit 786ed97458dc1f49cc5026bf226306cffdfb1925 @jmarshallnz jmarshallnz committed Nov 17, 2012
Showing with 3 additions and 5 deletions.
  1. +3 −5 xbmc/guilib/GUITextureGLES.cpp
@@ -75,18 +75,16 @@ void CGUITextureGLES::Begin(color_t color)
GLint tex1Loc = g_Windowing.GUIShaderGetCoord1();
glVertexAttribPointer(tex1Loc, 2, GL_FLOAT, 0, 0, m_tex1);
glEnableVertexAttribArray(tex1Loc);
-
- hasAlpha = true;
}
else
{
- if ( hasAlpha )
+ if (m_col[0][0] == 255 && m_col[0][1] == 255 && m_col[0][2] == 255 && m_col[0][3] == 255)
{
- g_Windowing.EnableGUIShader(SM_TEXTURE);
+ g_Windowing.EnableGUIShader(SM_TEXTURE_NOBLEND);
}
else
{
- g_Windowing.EnableGUIShader(SM_TEXTURE_NOBLEND);
+ g_Windowing.EnableGUIShader(SM_TEXTURE);
}
}

0 comments on commit 786ed97

Please sign in to comment.