diff options
| author | Louis-Francis Ratté-Boulianne <lfrb@collabora.com> | 2014-11-26 09:22:25 -0500 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-02 08:34:51 +0100 |
| commit | d6b51a87b482b69097100b9a2ce7ba85005e20ac (patch) | |
| tree | c29780d4f11e703e0f2b571cd2094ae998d7b7bf /vcl/inc/opengl/salbmp.hxx | |
| parent | 83c97b2a1c1a8d0531b6048fb27cf117b0da24e0 (diff) | |
vcl: Use the current OpenGL context for VirtualDevice and Bitmap if possible
Conflicts:
include/vcl/opengl/OpenGLContext.hxx
vcl/inc/openglgdiimpl.hxx
vcl/opengl/gdiimpl.cxx
vcl/opengl/x11/gdiimpl.cxx
vcl/source/opengl/OpenGLContext.cxx
Change-Id: I17f6ce66fb8b5bc027d35b4016ae56c24ee0a738
Diffstat (limited to 'vcl/inc/opengl/salbmp.hxx')
| -rw-r--r-- | vcl/inc/opengl/salbmp.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 20b0e6137f14..bc232b123380 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -39,6 +39,7 @@ class BitmapPalette; class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap { private: + OpenGLContext* mpContext; OpenGLTexture maTexture; bool mbDirtyTexture; BitmapPalette maPalette; |