diff options
author | davilla <davilla@svn> | 2010-05-18 07:29:17 +0000 |
---|---|---|
committer | davilla <davilla@svn> | 2010-05-18 07:29:17 +0000 |
commit | 07e5742b33364530dcb27835d7d62eeb84b07c95 (patch) | |
tree | c3d3d19fdfca7d7e82bf5c4637c20bc0b2169da4 /guilib/GUIFontTTF.cpp | |
parent | 7c8f29a57f510944bfa0beae8371b8d20a8e22f0 (diff) |
[arm] merge arm-camelot into trunk, thanks to mcgeagh for all his hard working getting arm platform rolling
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30281 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIFontTTF.cpp')
-rw-r--r-- | guilib/GUIFontTTF.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/guilib/GUIFontTTF.cpp b/guilib/GUIFontTTF.cpp index 177ae8f368..9f33b28713 100644 --- a/guilib/GUIFontTTF.cpp +++ b/guilib/GUIFontTTF.cpp @@ -673,6 +673,7 @@ void CGUIFontTTFBase::RenderCharacter(float posX, float posY, const Character *c v[i].a = GET_A(color); } +#ifdef HAS_GL v[0].u = tl; v[0].v = tt; v[0].x = x[0]; @@ -696,6 +697,32 @@ void CGUIFontTTFBase::RenderCharacter(float posX, float posY, const Character *c v[3].x = x[3]; v[3].y = y4; v[3].z = z4; +#else + // GLES uses triangle strips, not quads, so have to rearrange the vertex order + v[0].u = tl; + v[0].v = tt; + v[0].x = x[0]; + v[0].y = y1; + v[0].z = z1; + + v[1].u = tl; + v[1].v = tb; + v[1].x = x[3]; + v[1].y = y4; + v[1].z = z4; + + v[2].u = tr; + v[2].v = tt; + v[2].x = x[1]; + v[2].y = y2; + v[2].z = z2; + + v[3].u = tr; + v[3].v = tb; + v[3].x = x[2]; + v[3].y = y3; + v[3].z = z3; +#endif RenderInternal(v); |