diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-15 03:24:04 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-15 03:49:05 +0100 |
commit | 10e8194dd84ca58dfcbbff7f727e79fb8561a105 (patch) | |
tree | cfcc52bcdbcff76939c61f0afbf846c02e829081 /chart2 | |
parent | 6d6ba15f7dd3251e70d5311e6138f294025a0a5f (diff) |
remove unused functions
Change-Id: I5e176c705cc373333831e4b833386ed707418d2e
Diffstat (limited to 'chart2')
-rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 89 | ||||
-rwxr-xr-x | chart2/source/view/main/OpenGLRender.hxx | 2 |
2 files changed, 0 insertions, 91 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 963d6b0c8d0c..f48223d4184b 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -588,95 +588,6 @@ void OpenGLRender::renderToBitmap() glFlush(); } -int OpenGLRender::RenderTexture2FBO(GLuint TexID) -{ - CHECK_GL_ERROR(); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glDepthMask(GL_FALSE); - glUseProgram(m_RenderProID); - glEnableVertexAttribArray(m_RenderVertexID); - glBindBuffer(GL_ARRAY_BUFFER, m_RenderVertexBuf); - glVertexAttribPointer( - m_RenderVertexID, // attribute. No particular reason for 0, but must match the layout in the shader. - 3, // size - GL_FLOAT, // type - GL_FALSE, // normalized? - 0, // stride - (void*)0 // array buffer offset - ); - glEnableVertexAttribArray(m_RenderTexCoordID); - glBindBuffer(GL_ARRAY_BUFFER, m_RenderTexCoordBuf); - glVertexAttribPointer( - m_RenderTexCoordID, // attribute. No particular reason for 0, but must match the layout in the shader. - 2, // size - GL_FLOAT, // type - GL_FALSE, // normalized? - 0, // stride - (void*)0 // array buffer offset - ); - glBindTexture(GL_TEXTURE_2D, TexID); - glUniform1i(m_RenderTexID, 0); - //TODO: moggi: get rid fo GL_QUADS - glDrawArrays(GL_QUADS, 0, 4); - glDisableVertexAttribArray(m_RenderTexCoordID); - glDisableVertexAttribArray(m_RenderVertexID); - glBindTexture(GL_TEXTURE_2D, 0); - glUseProgram(0); - glDepthMask(GL_TRUE); - CHECK_GL_ERROR(); - - m_fZStep += Z_STEP; - return 0; -} - - -int OpenGLRender::RenderTexture(GLuint TexID) -{ - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - glUseProgram(m_RenderProID); - - glEnableVertexAttribArray(m_RenderVertexID); - glBindBuffer(GL_ARRAY_BUFFER, m_RenderVertexBuf); - glVertexAttribPointer( - m_RenderVertexID, // attribute. No particular reason for 0, but must match the layout in the shader. - 3, // size - GL_FLOAT, // type - GL_FALSE, // normalized? - 0, // stride - (void*)0 // array buffer offset - ); - glEnableVertexAttribArray(m_RenderTexCoordID); - glBindBuffer(GL_ARRAY_BUFFER, m_RenderTexCoordBuf); - glVertexAttribPointer( - m_RenderTexCoordID, // attribute. No particular reason for 0, but must match the layout in the shader. - 2, // size - GL_FLOAT, // type - GL_FALSE, // normalized? - 0, // stride - (void*)0 // array buffer offset - ); - glBindTexture(GL_TEXTURE_2D, TexID); - glUniform1i(m_RenderTexID, 0); - //TODO: moggi: get rid fo GL_QUADS - glDrawArrays(GL_QUADS, 0, 4); - glDisableVertexAttribArray(m_RenderTexCoordID); - glDisableVertexAttribArray(m_RenderVertexID); - glBindTexture(GL_TEXTURE_2D, 0); - glUseProgram(0); -#if defined( WNT ) - SwapBuffers(glWin.hDC); -#elif defined( MACOSX ) - -#elif defined( UNX ) - glXSwapBuffers(glWin.dpy, glWin.win); -#endif - glFlush(); - m_fZStep += Z_STEP; - return 0; -} - - int OpenGLRender::CreateTextureObj(int width, int height) { glGenTextures(1, &m_TextureObj); diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index a67309dc83ac..fb66cc37284a 100755 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -191,8 +191,6 @@ private: int CreateTextureObj(int width, int height); int CreateRenderObj(int width, int height); int CreateFrameBufferObj(); - int RenderTexture(GLuint TexID); - int RenderTexture2FBO(GLuint TexID); #if defined( _WIN32 ) int InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATDESCRIPTOR inPfd); bool WGLisExtensionSupported(const char *extension); |