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-14 01:45:55 +0000 |
commit | 6b443b08cbe50c228fee0d555df7dc40f0c8bbc5 (patch) | |
tree | ebd634a1c246247a18bd3d248eba7f9729476704 /vcl | |
parent | 166b7ef486ed7bdb41b728ea3a5196bab3201b1b (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')
-rw-r--r-- | vcl/inc/openglgdiimpl.hxx | 5 | ||||
-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 | ||||
-rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 1 |
5 files changed, 4 insertions, 11 deletions
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index a1c2a2539352..3e5ec94769ed 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -72,9 +72,6 @@ protected: OpenGLFramebuffer* mpFramebuffer; OpenGLProgram* mpProgram; - /// Is it someone else's context we shouldn't be fiddling with ? - static bool IsForeignContext(const rtl::Reference<OpenGLContext> &xContext); - /// This idle handler is used to swap buffers after rendering. OpenGLFlushIdle *mpFlush; @@ -174,7 +171,7 @@ protected: bool UseContext( const rtl::Reference<OpenGLContext> &pContext ) { return pContext->isInitialized() && // not released by the OS etc. - IsForeignContext( pContext ); // a genuine VCL context. + pContext->isVCLOnly(); } public: diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 380417d1aa70..f1068721a887 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; diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index ed1347d4b801..771b548f1eb8 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -62,6 +62,7 @@ OpenGLContext::OpenGLContext(): mnRefCount(0), mbRequestLegacyContext(false), mbUseDoubleBufferedRendering(true), + mbVCLOnly(false), mnFramebufferCount(0), mpCurrentFramebuffer(nullptr), mpFirstFramebuffer(nullptr), |