diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-02-27 12:15:35 +1300 |
|---|---|---|
| committer | jmarshallnz <jcmarsha@gmail.com> | 2014-02-27 12:15:35 +1300 |
| commit | b8512bf8bbff9eb96c66b09ce4ff6ac9a56b42dd (patch) | |
| tree | 7525b9e157350994e9cecfee1db9281d60146bc6 | |
| parent | d13fc40a47e5893b8c7c0a390d2c286302840176 (diff) | |
| parent | fbf53f386c412b05559a0587dfd860a1405db107 (diff) | |
Merge pull request #4281 from koying/fixgleskaraoke
FIX: [gles] fix karaoke and teletext rendering
| -rw-r--r-- | xbmc/guilib/GUITextureGLES.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/xbmc/guilib/GUITextureGLES.cpp b/xbmc/guilib/GUITextureGLES.cpp index df47ced8f9..7bc8a1d175 100644 --- a/xbmc/guilib/GUITextureGLES.cpp +++ b/xbmc/guilib/GUITextureGLES.cpp @@ -260,20 +260,12 @@ void CGUITextureGLES::DrawQuad(const CRect &rect, color_t color, CBaseTexture *t glUniform4f(uniColLoc, col[0] / 255.0f, col[1] / 255.0f, col[2] / 255.0f, col[3] / 255.0f); - // Setup vertex position values - #define ROUND_TO_PIXEL(x) (float)(MathUtils::round_int(x)) - ver[0][0] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalXCoord(rect.x1, rect.y1)); - ver[0][1] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalYCoord(rect.x1, rect.y1)); - ver[0][2] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalZCoord(rect.x1, rect.y1)); - ver[1][0] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalXCoord(rect.x2, rect.y1)); - ver[1][1] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalYCoord(rect.x2, rect.y1)); - ver[1][2] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalZCoord(rect.x2, rect.y1)); - ver[2][0] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalXCoord(rect.x2, rect.y2)); - ver[2][1] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalYCoord(rect.x2, rect.y2)); - ver[2][2] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalZCoord(rect.x2, rect.y2)); - ver[3][0] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalXCoord(rect.x1, rect.y2)); - ver[3][1] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalYCoord(rect.x1, rect.y2)); - ver[3][2] = ROUND_TO_PIXEL(g_graphicsContext.ScaleFinalZCoord(rect.x1, rect.y2)); + ver[0][0] = ver[3][0] = rect.x1; + ver[0][1] = ver[1][1] = rect.y1; + ver[1][0] = ver[2][0] = rect.x2; + ver[2][1] = ver[3][1] = rect.y2; + ver[0][2] = ver[1][2] = ver[2][2] = ver[3][2]= 0; + if (texture) { // Setup texture coordinates |