diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-16 09:17:37 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-19 21:32:19 +0200 |
| commit | 90a3ecb8aa0a2c07d7c3b0a2c64bca502e12bf0f (patch) | |
| tree | aab6556b88a950fa6a5223b262e45621bbbe05d6 /vcl/win/source/gdi/salgdi.cxx | |
| parent | fba72931db258ff3aa464932a2d75c55d340281f (diff) | |
GL paint-flushing guard re-work.
Unfortunately, since we can have 2x SalGraphics' on a OutputDevice,
and one of these can be a printer - things got very confused around
which context to glFlush. This de-tangles the various reference-counts.
Conflicts:
vcl/inc/generic/genpspgraphics.h
vcl/win/source/gdi/salgdi.cxx
Change-Id: I1062be0b02a91fc9009deaa3ec29c5dbb227df20
Reviewed-on: https://gerrit.libreoffice.org/18611
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/win/source/gdi/salgdi.cxx')
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 99cebeee5fbf..3ed0c073c05c 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -1210,14 +1210,9 @@ css::uno::Any WinSalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rS return css::uno::Any( args ); } -void WinSalGraphics::BeginPaint() +OpenGLContext *WinSalGraphics::BeginPaint() { return mpImpl->beginPaint(); } -void WinSalGraphics::EndPaint() -{ - return mpImpl->endPaint(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |