diff options
| author | Louis-Francis Ratté-Boulianne <lfrb@collabora.com> | 2014-11-13 21:37:54 -0500 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-11-15 12:17:43 +0100 |
| commit | dce9610afed674ecec23497a1a004193a6cf3bf1 (patch) | |
| tree | 7b0e2063667645ae3a4259a08c0ab1d2fce0eaf1 /vcl/inc/opengl/salbmp.hxx | |
| parent | 330b7b310193f3290cbd4c340659f72d12c352e1 (diff) | |
vcl: Improve OpenGLTexture implementation by allowing implicit sharing
Conflicts:
vcl/opengl/gdiimpl.cxx
Change-Id: I6421265325e72023d1affe671d75488185772786
Diffstat (limited to 'vcl/inc/opengl/salbmp.hxx')
| -rw-r--r-- | vcl/inc/opengl/salbmp.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index c1f0cdb817ad..dbb29d80f802 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -40,7 +40,7 @@ class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap { private: OpenGLContext* mpContext; - OpenGLTextureSharedPtr mpTexture; + OpenGLTexture maTexture; bool mbDirtyTexture; BitmapPalette maPalette; basebmp::RawMemorySharedArray maUserBuffer; @@ -81,9 +81,8 @@ public: public: - bool Create( OpenGLContext& rContext, OpenGLTextureSharedPtr pTex, long nX, long nY, long nWidth, long nHeight ); - bool Draw( OpenGLContext& rContext, const SalTwoRect& rPosAry ); - GLuint GetTexture( OpenGLContext& rContext ) const; + bool Create( OpenGLContext& rContext, const OpenGLTexture& rTex, long nX, long nY, long nWidth, long nHeight ); + OpenGLTexture& GetTexture( OpenGLContext& rContext ) const; private: |