diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-25 11:24:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-26 06:49:31 +0000 |
| commit | fe1f1247fad782bdf43322532fdeb1ba9f03135a (patch) | |
| tree | c8dfc79901c98bb69c3dd5e2a8ea5ab8cbbe6360 /vcl/inc/opengl | |
| parent | 9c34797cc98030614b384b6ea0f233d59ae82253 (diff) | |
loplugin:expandablemethods in vcl
Change-Id: I1876e203d3a3a5fa36d83a9b282ba49429c1da2a
Reviewed-on: https://gerrit.libreoffice.org/30261
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc/opengl')
| -rw-r--r-- | vcl/inc/opengl/BufferObject.hxx | 17 | ||||
| -rw-r--r-- | vcl/inc/opengl/texture.hxx | 1 |
2 files changed, 6 insertions, 12 deletions
diff --git a/vcl/inc/opengl/BufferObject.hxx b/vcl/inc/opengl/BufferObject.hxx index 3cda66deed0e..56f3aa9c20de 100644 --- a/vcl/inc/opengl/BufferObject.hxx +++ b/vcl/inc/opengl/BufferObject.hxx @@ -30,7 +30,12 @@ public: virtual ~BufferObject() { - dispose(); + if (mId) + { + glDeleteBuffers(1, &mId); + CHECK_GL_ERROR(); + mId = 0; + } } void bind() @@ -61,16 +66,6 @@ public: } } - void dispose() - { - if (mId) - { - glDeleteBuffers(1, &mId); - CHECK_GL_ERROR(); - mId = 0; - } - } - }; template<typename TYPE> diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx index b092473fe1d6..923e9d43c65e 100644 --- a/vcl/inc/opengl/texture.hxx +++ b/vcl/inc/opengl/texture.hxx @@ -47,7 +47,6 @@ public: ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, void const * pData ); ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight ); ~ImplOpenGLTexture(); - void Dispose(); bool InsertBuffer(int nX, int nY, int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData); |