diff options
| author | mcgeagh <mcgeagh@svn> | 2010-09-08 16:13:19 +0000 |
|---|---|---|
| committer | mcgeagh <mcgeagh@svn> | 2010-09-08 16:13:19 +0000 |
| commit | 77b96ea0d6eba4afb7ace202231a8e08a0be95b3 (patch) | |
| tree | 6ffd0f8509b5729431fa4ee295941384f1f2348b /guilib/GUITextureGLES.cpp | |
| parent | 1f34208c99db496e7c0d90e112890366123340c0 (diff) | |
[ARM] Fixed: General OpenGL ES2.0 fixes
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33618 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUITextureGLES.cpp')
| -rw-r--r-- | guilib/GUITextureGLES.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/guilib/GUITextureGLES.cpp b/guilib/GUITextureGLES.cpp index 6fcd3692cf..8c4bbbef57 100644 --- a/guilib/GUITextureGLES.cpp +++ b/guilib/GUITextureGLES.cpp @@ -68,6 +68,15 @@ void CGUITextureGLES::Begin(color_t color) glEnableVertexAttribArray(colLoc); glEnableVertexAttribArray(tex0Loc); + // Setup Colors + for (int i = 0; i < 4; i++) + { + m_col[i][0] = (GLubyte)GET_R(color); + m_col[i][1] = (GLubyte)GET_G(color); + m_col[i][2] = (GLubyte)GET_B(color); + m_col[i][3] = (GLubyte)GET_A(color); + } + if (m_diffuse.size()) { GLint tex1Loc = g_Windowing.GUIShaderGetCoord1(); @@ -91,14 +100,7 @@ void CGUITextureGLES::Begin(color_t color) g_Windowing.EnableGUIShader(SM_TEXTURE_NOBLEND); } } - // Setup Colors - for (int i = 0; i < 4; i++) - { - m_col[i][0] = (GLubyte)GET_R(color); - m_col[i][1] = (GLubyte)GET_G(color); - m_col[i][2] = (GLubyte)GET_B(color); - m_col[i][3] = (GLubyte)GET_A(color); - } + } void CGUITextureGLES::End() |