diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-12-11 18:18:50 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-12-11 20:39:15 +0000 |
| commit | 6c68b71058263be74197a961fd7dfd2b43caf22d (patch) | |
| tree | 01d0ac419e0fa9bb52c0753a82f531a287af9b88 /vcl/opengl | |
| parent | 39b2c407610a9a4197960ac259b4284f01459b3c (diff) | |
vcl: use a custom tag for VCL OpenGLContext's to avoid re-use.
Other code is out of legacy mode now, so can't legacy as a proxy.
Change-Id: Ie3807a3af680b707f2f08d058db955bc9cae6c2b
Reviewed-on: https://gerrit.libreoffice.org/20647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/opengl')
| -rw-r--r-- | vcl/opengl/gdiimpl.cxx | 7 | ||||
| -rw-r--r-- | vcl/opengl/win/gdiimpl.cxx | 1 | ||||
| -rw-r--r-- | vcl/opengl/x11/gdiimpl.cxx | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 16bb72a14eb3..0b6dc76a4c12 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -2092,11 +2092,4 @@ void OpenGLSalGraphicsImpl::doFlush() VCL_GL_INFO( "flushAndSwap - end." ); } -bool OpenGLSalGraphicsImpl::IsForeignContext(const rtl::Reference<OpenGLContext> &xContext) -{ - // so far a blunt heuristic: vcl uses shiny new contexts. - return xContext->requestedLegacy(); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx index 666cdbfa393e..9ca266a6604a 100644 --- a/vcl/opengl/win/gdiimpl.cxx +++ b/vcl/opengl/win/gdiimpl.cxx @@ -29,6 +29,7 @@ void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* rtl::Reference<OpenGLContext> WinOpenGLSalGraphicsImpl::CreateWinContext() { rtl::Reference<OpenGLContext> pContext = OpenGLContext::Create(); + pContext->setVCLOnly(); pContext->init( mrParent.mhLocalDC, mrParent.mhWnd ); return pContext; } diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx index 595ca45ca4b0..effc81b3c815 100644 --- a/vcl/opengl/x11/gdiimpl.cxx +++ b/vcl/opengl/x11/gdiimpl.cxx @@ -53,6 +53,7 @@ rtl::Reference<OpenGLContext> X11OpenGLSalGraphicsImpl::CreateWinContext() Window aWin = pProvider->GetX11Window(); rtl::Reference<OpenGLContext> pContext = OpenGLContext::Create(); + pContext->setVCLOnly(); pContext->init( mrParent.GetXDisplay(), aWin, mrParent.m_nXScreen.getXScreen() ); return pContext; |