chart2/source/view/inc/GL3DRenderer.hxx | 6 ++++-- chart2/source/view/main/OpenGLRender.cxx | 2 ++ chart2/source/view/main/OpenGLRender.hxx | 17 +++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-)
New commits: commit 3fef59ce0bc00a05a0577bf8e3a76e322b538099 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Apr 29 12:46:38 2014 +0300 WaE: unused private fields I don't know if the fields in question are going to be used later or just leftovers, so even if I strongly suspect the latter, I put them in #if 0. Change-Id: Ia40354e653b1827ec046f32e21165db4ac7bc78e diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index af14537..24a0067 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -214,7 +214,9 @@ private: // Our ModelViewProjection : multiplication of our 3 matrices glm::mat4 m_MVP; +#if 0 double m_dFreq; +#endif int m_iWidth; @@ -257,11 +259,11 @@ private: GLuint m_3DNormalMatrixID; GLuint m_3DUBOBuffer; - +#if 0 GLint m_3DLightBlockIndex; GLint m_3DMaterialBlockIndex; - +#endif GLint m_3DActualSizeLight; GLuint m_NormalBuffer; diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 2b7eab1..06ebc60 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -510,7 +510,9 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget): , m_iWidth(1600) , m_iHeight(900) , m_Model(glm::mat4(1.0f)) +#if 0 , m_iPointNum(0) +#endif , m_fLineWidth(0.001f) , mbArbMultisampleSupported(false) #if defined( _WIN32 ) diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 3e29c9b..07e15eb 100644 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -120,10 +120,11 @@ public: private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTarget; - //for performance +#if 0 + //for performance double m_dFreq; - +#endif int m_iWidth; int m_iHeight; @@ -143,9 +144,9 @@ private: glm::mat4 m_Model; // Our ModelViewProjection : multiplication of our 3 matrices glm::mat4 m_MVP; - +#if 0 GLint m_RenderProID; - +#endif glm::vec4 m_ClearColor; GLuint m_VertexBuffer; @@ -153,13 +154,13 @@ private: GLuint m_ColorBuffer; GLint m_MatrixID; - +#if 0 GLint m_RenderVertexID; GLint m_RenderTexCoordID; GLint m_RenderTexID; - +#endif GLuint m_RenderVertexBuf; GLuint m_RenderTexCoordBuf; @@ -169,9 +170,9 @@ private: GLuint m_FboID[2]; GLuint m_RboID[2]; - +#if 0 int m_iPointNum; - +#endif Line2DPointList m_Line2DPointList; float m_fLineWidth; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits