diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-15 03:46:52 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-15 03:49:05 +0100 |
commit | 38f8f1b78232c69e3927ebfc852dc2712bfd72da (patch) | |
tree | 2516456365ad8c4ca415971b55dbc0637e716e69 /chart2 | |
parent | a3dfd7f5fbcfcfb6a9c2e760d78446470c89688c (diff) |
remove more unused code
Change-Id: I36ec2e2960072120a064805f171e20703f0508c0
Diffstat (limited to 'chart2')
-rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 21 | ||||
-rwxr-xr-x | chart2/source/view/main/OpenGLRender.hxx | 13 |
2 files changed, 1 insertions, 33 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index e6e04cf335d9..55feba51838d 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -281,13 +281,6 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow) CHECK_GL_ERROR(); - m_RenderProID = LoadShaders("renderVertexShader", "renderFragmentShader"); - m_RenderVertexID = glGetAttribLocation(m_RenderProID, "vPosition"); - m_RenderTexCoordID = glGetAttribLocation(m_RenderProID, "texCoord"); - m_RenderTexID = glGetUniformLocation(m_RenderProID, "RenderTex"); - - CHECK_GL_ERROR(); - m_CommonProID = LoadShaders("commonVertexShader", "commonFragmentShader"); m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP"); m_2DVertexID = glGetAttribLocation(m_CommonProID, "vPosition"); @@ -323,15 +316,6 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow) CHECK_GL_ERROR(); - glGenBuffers(1, &m_RenderVertexBuf); - glBindBuffer(GL_ARRAY_BUFFER, m_RenderVertexBuf); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - glGenBuffers(1, &m_RenderTexCoordBuf); - glBindBuffer(GL_ARRAY_BUFFER, m_RenderTexCoordBuf); - glBufferData(GL_ARRAY_BUFFER, sizeof(texCoords), texCoords, GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); - glGenBuffers(1, &m_TextTexCoordBuf); glBindBuffer(GL_ARRAY_BUFFER, m_TextTexCoordBuf); glBufferData(GL_ARRAY_BUFFER, sizeof(texCoords), texCoords, GL_STATIC_DRAW); @@ -650,9 +634,6 @@ void OpenGLRender::Release() { glDeleteBuffers(1, &m_VertexBuffer); glDeleteBuffers(1, &m_ColorBuffer); - glDeleteBuffers(1, &m_RenderVertexBuf); - glDeleteBuffers(1, &m_RenderTexCoordBuf); - glDeleteProgram(m_RenderProID); glDeleteProgram(m_CommonProID); glDeleteProgram(m_TextProID); glDeleteProgram(m_BackgroundProID); @@ -704,7 +685,7 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget) , m_TextProID(0) , m_TextMatrixID(0) , m_TextVertexID(0) - , m_TextTexCoordID(1) + , m_TextTexCoordID(0) , m_TextTexCoordBuf(0) , m_TextTexID(0) , m_BackgroundProID(0) diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index cd2d8bc15810..2a934cf39399 100755 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -205,25 +205,12 @@ private: // Our ModelViewProjection : multiplication of our 3 matrices glm::mat4 m_MVP; - GLint m_RenderProID; - - GLuint m_VertexBuffer; GLuint m_ColorBuffer; GLint m_MatrixID; - GLint m_RenderVertexID; - - GLint m_RenderTexCoordID; - - GLint m_RenderTexID; - - GLuint m_RenderVertexBuf; - - GLuint m_RenderTexCoordBuf; - GLuint m_TextureObj; GLuint m_FboID; |