diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-11-18 20:21:07 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-11-18 21:26:23 +0000 |
| commit | fa6a174b50747e6f6c83d0cd882ce0bd0886930b (patch) | |
| tree | 12e062cc674bedd05f2485da7b467ab3c5c1c0c1 /vcl/inc/opengl/salbmp.hxx | |
| parent | 721fb11053327a557fc81f3ced4bf8af52e73c64 (diff) | |
vcl: since we share Bitmaps across all GLContexts simplify lifecycle.
~X11SalVirtualDevice() was destroying X resources referred to by
OpenGLSalBitmap's mpContext, which were subsequently accessed by
Bitmap::AcquireReadAccess on the floating Bitmap. Better to use the
default window's GLContext for all bitmap operations.
Change-Id: I9009980e791cff1a1f36d626592d72c7a32efd39
Diffstat (limited to 'vcl/inc/opengl/salbmp.hxx')
| -rw-r--r-- | vcl/inc/opengl/salbmp.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index c8626729a63c..972fee067e0e 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -39,7 +39,6 @@ class BitmapPalette; class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap { private: - OpenGLContext* mpContext; OpenGLTexture maTexture; bool mbDirtyTexture; BitmapPalette maPalette; @@ -83,8 +82,9 @@ public: public: - bool Create( OpenGLContext& rContext, const OpenGLTexture& rTex, long nX, long nY, long nWidth, long nHeight ); + bool Create( const OpenGLTexture& rTex, long nX, long nY, long nWidth, long nHeight ); OpenGLTexture& GetTexture() const; + OpenGLContext* GetBitmapContext() const; private: |