diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-15 03:04:51 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-15 03:08:18 +0100 |
commit | eabba2d8421cf9fe47b7a40169e2c4b5cadbdf27 (patch) | |
tree | b4f6381efdf9c84b2e49bb7c6c8b2a597d6475b4 /chart2 | |
parent | 48545bb3952e000d72e7c3b1719e4c526b289650 (diff) |
remove unnecessary stuff
Change-Id: Ideac5b1bdd86ed8eaf37d8f9554293d965cb8612
Diffstat (limited to 'chart2')
-rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 1f07b4659563..1dabe73921d1 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -1330,10 +1330,6 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill) int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, awt::Point aPos, awt::Size aSize, long rotation, const drawing::HomogenMatrix3& rTrans) { - glm::mat3 aTrans(rTrans.Line1.Column1, rTrans.Line1.Column2, rTrans.Line1.Column3, - rTrans.Line2.Column1, rTrans.Line2.Column2, rTrans.Line2.Column3, - rTrans.Line3.Column1, rTrans.Line3.Column3, rTrans.Line3.Column3); - #if DEBUG_PNG // debug PNG writing static int nIdx = 0; OUString aName = OUString( "file:///home/moggi/Documents/work/text" ) + OUString::number( nIdx++ ) + ".png"; @@ -1454,7 +1450,7 @@ int OpenGLRender::RenderTextShape() glEnableVertexAttribArray(m_TextVertexID); glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer); glVertexAttribPointer( - m_TextVertexID, // attribute. No particular reason for 0, but must match the layout in the shader. + m_TextVertexID, 3, // size GL_FLOAT, // type GL_FALSE, // normalized? @@ -1466,7 +1462,7 @@ int OpenGLRender::RenderTextShape() glEnableVertexAttribArray(m_TextTexCoordID); glBindBuffer(GL_ARRAY_BUFFER, m_TextTexCoordBuf); glVertexAttribPointer( - m_TextTexCoordID, // attribute. No particular reason for 0, but must match the layout in the shader. + m_TextTexCoordID, 2, // size GL_FLOAT, // type GL_FALSE, // normalized? |