diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-16 09:17:37 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-09-16 09:50:43 +0000 |
| commit | bfceb557efcd607ef018ae35fc73f8d61a9b9a4e (patch) | |
| tree | 7f46254e93f12bc3b96cb49fa52afa97a855c2e3 /vcl/unx/generic | |
| parent | 4af40495b7dcdac3add67c634dde75c896e370d9 (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.
Change-Id: I1062be0b02a91fc9009deaa3ec29c5dbb227df20
Reviewed-on: https://gerrit.libreoffice.org/18604
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 3059dc4a790a..24173c787ddf 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -270,9 +270,6 @@ public: virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) SAL_OVERRIDE; - virtual void beginPaint() SAL_OVERRIDE { } - virtual void endPaint() SAL_OVERRIDE { } - public: // implementation of X11GraphicsImpl diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 13c85b99190c..699dab03a5b5 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -556,16 +556,11 @@ bool X11SalGraphics::drawGradient(const tools::PolyPolygon& rPoly, const Gradien return mxImpl->drawGradient(rPoly, rGradient); } -void X11SalGraphics::BeginPaint() +OpenGLContext *X11SalGraphics::BeginPaint() { return mxImpl->beginPaint(); } -void X11SalGraphics::EndPaint() -{ - return mxImpl->endPaint(); -} - SalGeometryProvider *X11SalGraphics::GetGeometryProvider() const { if (m_pFrame) |