diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-08-03 15:06:55 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-08-07 09:35:28 +0000 |
| commit | b63b54e7453cdda92914dfe3d1ea2d9f0d1f0d29 (patch) | |
| tree | 550d1a686a5f0288eea9d921d6b8806522e57283 /vcl/inc | |
| parent | b55e95ab39c684e226c667af456dea4f3d53b791 (diff) | |
opengl: cache native widget textures also for Windows
Change-Id: I476f0ffaef383f3227c0c12b50fcdebf393190f6
Reviewed-on: https://gerrit.libreoffice.org/17487
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit dea885f80a80c6a5839ee5dbf8521487186a9522)
Reviewed-on: https://gerrit.libreoffice.org/17561
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/opengl/win/gdiimpl.hxx | 9 | ||||
| -rw-r--r-- | vcl/inc/openglgdiimpl.hxx | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx index 03007c9ad188..e1fa195286a6 100644 --- a/vcl/inc/opengl/win/gdiimpl.hxx +++ b/vcl/inc/opengl/win/gdiimpl.hxx @@ -23,6 +23,9 @@ class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl private: WinSalGraphics& mrParent; + bool RenderCompatibleDC(OpenGLCompatibleDC& rWhite, OpenGLCompatibleDC& rBlack, + int nX, int nY, TextureCombo& rCombo); + public: WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics, SalGeometryProvider *mpProvider); @@ -34,6 +37,12 @@ protected: public: virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE; + + bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY); + + bool RenderAndCacheNativeControl(OpenGLCompatibleDC& rWhite, OpenGLCompatibleDC& rBlack, + int nX, int nY , ControlCacheKey& aControlCacheKey); + }; #endif diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 1ac1ec388dec..9e95f5ec113c 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -40,6 +40,12 @@ namespace basegfx class B2DTrapezoid; }; +struct TextureCombo +{ + std::unique_ptr<OpenGLTexture> mpTexture; + std::unique_ptr<OpenGLTexture> mpMask; +}; + class VCL_PLUGIN_PUBLIC OpenGLSalGraphicsImpl : public SalGraphicsImpl { protected: |