diff options
author | Louis-Francis Ratté-Boulianne <lfrb@collabora.com> | 2014-12-02 09:05:19 -0500 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-12-03 14:05:34 +0100 |
commit | 0a04ceca6cbebd76655c5ec6d31168da7672be20 (patch) | |
tree | 13acb6ec18f25f5357ffb0d161145ac3d0fcb857 /vcl | |
parent | d8a8ff8177df628636d80c4dc1d8f597f6677dfc (diff) |
vcl: Don't create new contexts for Virtual Devices on Windows
Change-Id: I561a8142f986aca89e796ce2c4a0902fae41f9e6
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/opengl/win/gdiimpl.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/opengl/x11/gdiimpl.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/openglgdiimpl.hxx | 6 | ||||
-rw-r--r-- | vcl/opengl/gdiimpl.cxx | 16 | ||||
-rw-r--r-- | vcl/opengl/win/gdiimpl.cxx | 11 | ||||
-rw-r--r-- | vcl/opengl/x11/gdiimpl.cxx | 10 | ||||
-rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 11 |
7 files changed, 11 insertions, 45 deletions
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx index 30ade233b543..03007c9ad188 100644 --- a/vcl/inc/opengl/win/gdiimpl.hxx +++ b/vcl/inc/opengl/win/gdiimpl.hxx @@ -30,7 +30,6 @@ public: protected: virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE; virtual bool UseContext( OpenGLContext* pContext ) SAL_OVERRIDE; - virtual OpenGLContext* CreatePixmapContext() SAL_OVERRIDE; public: virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE; diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx index d6ef0101920b..feb3961a5e71 100644 --- a/vcl/inc/opengl/x11/gdiimpl.hxx +++ b/vcl/inc/opengl/x11/gdiimpl.hxx @@ -27,7 +27,6 @@ public: protected: virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE; - virtual OpenGLContext* CreatePixmapContext() SAL_OVERRIDE; virtual bool UseContext( OpenGLContext* pContext ) SAL_OVERRIDE; public: diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index d328ab724b2f..03d1c239b0d6 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -110,12 +110,12 @@ protected: bool AcquireContext(); bool ReleaseContext(); + // retrieve the default context for offscreen rendering + virtual OpenGLContext* GetDefaultContext(); + // create a new context for window rendering virtual OpenGLContext* CreateWinContext() = 0; - // create a new context for offscreen rendering - virtual OpenGLContext* CreatePixmapContext() = 0; - // check whether the given context can be used by this instance virtual bool UseContext( OpenGLContext* pContext ) = 0; diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 970957cf1555..e836e821f82f 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -61,6 +61,11 @@ OpenGLContext* OpenGLSalGraphicsImpl::GetOpenGLContext() return mpContext; } +OpenGLContext* OpenGLSalGraphicsImpl::GetDefaultContext() +{ + return ImplGetDefaultWindow()->GetGraphics()->GetOpenGLContext(); +} + bool OpenGLSalGraphicsImpl::AcquireContext( ) { ImplSVData* pSVData = ImplGetSVData(); @@ -81,7 +86,7 @@ bool OpenGLSalGraphicsImpl::AcquireContext( ) if( pContext ) pContext->AddRef(); else - pContext = mbOffscreen ? CreatePixmapContext() : CreateWinContext(); + pContext = mbOffscreen ? GetDefaultContext() : CreateWinContext(); mpContext = pContext; return (mpContext != NULL); @@ -112,15 +117,6 @@ void OpenGLSalGraphicsImpl::Init() maOffscreenTex.GetHeight() != GetHeight() ) { maOffscreenTex = OpenGLTexture(); -#if defined(WNT) - // URGH ... VirtualDevice may have destroyed the underlying resource - // our context is associated with - FIXME: can we do better here ? - if (mpContext) - { - mpContext->resetToReInitialize(); - ReleaseContext(); - } -#endif } } diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx index 939d4e0a1c50..a56ea3063b14 100644 --- a/vcl/opengl/win/gdiimpl.cxx +++ b/vcl/opengl/win/gdiimpl.cxx @@ -38,16 +38,9 @@ bool WinOpenGLSalGraphicsImpl::UseContext( OpenGLContext* pContext ) { if( !pContext || !pContext->isInitialized() ) return false; + if( IsOffscreen() ) + return true; return ( pContext->getOpenGLWindow().hWnd == mrParent.mhWnd ); } -OpenGLContext* WinOpenGLSalGraphicsImpl::CreatePixmapContext() -{ - OpenGLContext* pContext = new OpenGLContext(); - pContext->requestVirtualDevice(); - pContext->requestSingleBufferedRendering(); - pContext->init( mrParent.mhLocalDC, mrParent.mhWnd ); - return pContext; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx index e5070d7b02c7..d0d890b97fc6 100644 --- a/vcl/opengl/x11/gdiimpl.cxx +++ b/vcl/opengl/x11/gdiimpl.cxx @@ -56,16 +56,6 @@ OpenGLContext* X11OpenGLSalGraphicsImpl::CreateWinContext() return pContext; } -OpenGLContext* X11OpenGLSalGraphicsImpl::CreatePixmapContext() -{ - X11OpenGLSalVirtualDevice* pVDev = dynamic_cast<X11OpenGLSalVirtualDevice*>(mrParent.m_pVDev); - - if( pVDev == NULL ) - return NULL; - - return ImplGetDefaultWindow()->GetGraphics()->GetOpenGLContext(); -} - bool X11OpenGLSalGraphicsImpl::UseContext( OpenGLContext* pContext ) { X11WindowProvider *pProvider = dynamic_cast<X11WindowProvider*>(mrParent.m_pFrame); diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 1de58cf5886e..13823f3d477d 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -633,17 +633,6 @@ bool OpenGLContext::init(SystemChildWindow* pChildWindow) return ImplInit(); } -#if defined( WNT ) -// FIXME share resetToReInitialize() across platforms... -void OpenGLContext::resetToReInitialize() -{ - if( !mbInitialized ) - return; - resetCurrent(); - mbInitialized = false; -} -#endif - #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID bool OpenGLContext::init(Display* dpy, Window win, int screen) { |