mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#94006 - need an explicit dispose for GLContext's SystemChildWindow.

Browse Source 
Previously we would get an explicit ~OpenGLContext - and potentially
leave FMR's around for other OGC users, now we treat the other users
properly - we need an explicit dispose() to get Window::dispose ordering
right.

Change-Id: I5edcbd73399b6db3dbcfb391570f364f9ab0c70d
Reviewed-on: https://gerrit.libreoffice.org/18412
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Michael Meeks 2015-09-08 15:57:55 +01:00 committed by Markus Mohrhard
parent f19049065a
commit 82d25c02f8
5 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
avmedia/source/opengl/oglplayer.cxx
View File

@ -41,6 +41,7 @@ OGLPlayer::~OGLPlayer()
{ {
m_xContext->makeCurrent(); m_xContext->makeCurrent();
gltf_renderer_release(m_pHandle); gltf_renderer_release(m_pHandle);
m_xContext->dispose();
} }
releaseInputFiles(); releaseInputFiles();
} }

2
canvas/source/opengl/ogl_spritedevicehelper.cxx
View File

@ -90,7 +90,7 @@ namespace oglcanvas
{} {}
SpriteDeviceHelper::~SpriteDeviceHelper() SpriteDeviceHelper::~SpriteDeviceHelper()
{} { mxContext->dispose(); }
void SpriteDeviceHelper::init( vcl::Window& rWindow, void SpriteDeviceHelper::init( vcl::Window& rWindow,
SpriteCanvas& rSpriteCanvas, SpriteCanvas& rSpriteCanvas,

1
include/vcl/opengl/OpenGLContext.hxx
View File

@ -175,6 +175,7 @@ public:
~OpenGLContext(); ~OpenGLContext();
void acquire() { mnRefCount++; } void acquire() { mnRefCount++; }
void release() { if ( --mnRefCount == 0 ) delete this; } void release() { if ( --mnRefCount == 0 ) delete this; }
void dispose();
void requestLegacyContext(); void requestLegacyContext();
void requestSingleBufferedRendering(); void requestSingleBufferedRendering();

9
vcl/source/opengl/OpenGLContext.cxx
View File

@ -112,6 +112,13 @@ OpenGLContext::~OpenGLContext()
assert (mnRefCount == 1); assert (mnRefCount == 1);
} }
// release associated child-window if we have one
void OpenGLContext::dispose()
{
reset();
m_pChildWindow.disposeAndClear();
}
rtl::Reference<OpenGLContext> OpenGLContext::Create() rtl::Reference<OpenGLContext> OpenGLContext::Create()
{ {
return rtl::Reference<OpenGLContext>(new OpenGLContext); return rtl::Reference<OpenGLContext>(new OpenGLContext);
@ -1191,6 +1198,7 @@ void OpenGLContext::reset()
wglMakeCurrent(NULL, NULL); wglMakeCurrent(NULL, NULL);
wglDeleteContext( m_aGLWin.hRC ); wglDeleteContext( m_aGLWin.hRC );
ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC ); ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
m_aGLWin.hRC = 0;
} }
#elif defined( MACOSX ) #elif defined( MACOSX )
OpenGLWrapper::resetCurrent(); OpenGLWrapper::resetCurrent();
@ -1212,6 +1220,7 @@ void OpenGLContext::reset()
if (mbPixmap && m_aGLWin.glPix != None) if (mbPixmap && m_aGLWin.glPix != None)
glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix); glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix);
m_aGLWin.ctx = 0;
} }
#endif #endif
} }

8
vcl/source/window/openglwin.cxx
View File

@ -16,7 +16,7 @@ class OpenGLWindowImpl
{ {
public: public:
explicit OpenGLWindowImpl(vcl::Window* pWindow); explicit OpenGLWindowImpl(vcl::Window* pWindow);
~OpenGLWindowImpl() { mxChildWindow.disposeAndClear(); } ~OpenGLWindowImpl();
OpenGLContext& getContext() { return *mxContext.get(); } OpenGLContext& getContext() { return *mxContext.get(); }
private: private:
rtl::Reference<OpenGLContext> mxContext; rtl::Reference<OpenGLContext> mxContext;
@ -33,6 +33,12 @@ OpenGLWindowImpl::OpenGLWindowImpl(vcl::Window* pWindow)
pWindow->SetMouseTransparent(false); pWindow->SetMouseTransparent(false);
} }
OpenGLWindowImpl::~OpenGLWindowImpl()
{
mxContext->dispose();
mxChildWindow.disposeAndClear();
}
OpenGLWindow::OpenGLWindow(vcl::Window* pParent): OpenGLWindow::OpenGLWindow(vcl::Window* pParent):
Window(pParent, 0), Window(pParent, 0),
mxImpl(new OpenGLWindowImpl(this)), mxImpl(new OpenGLWindowImpl(this)),