vcl/opengl/texture.cxx | 39 +++++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 14 deletions(-)
New commits:
commit 2355067fa131c136555cb290c4e9d5042e005184
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date: Tue Mar 22 16:22:23 2016 +0100
trying to get a GL context after GL de-initialization - fixed
Change-Id: I5f38f72b0e2c0204875d0dfbb759d6b13415560a
Reviewed-on: https://gerrit.libreoffice.org/23434
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 3b484c0..1b2e5a7 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -164,26 +164,37 @@ void ImplOpenGLTexture::Dispose()
{
if( mnTexture != 0 )
{
- OpenGLVCLContextZone aContextZone;
+ // During shutdown GL is already de-initialized, so we should not try
to create a new context.
+ OpenGLZone aZone;
+ rtl::Reference<OpenGLContext> xContext =
OpenGLContext::getVCLContext(false);
+ if( xContext.is() )
+ {
+ // FIXME: this is really not optimal performance-wise.
- // FIXME: this is really not optimal performance-wise.
+ // Check we have been correctly un-bound from all framebuffers.
+ ImplSVData* pSVData = ImplGetSVData();
+ rtl::Reference<OpenGLContext> pContext =
pSVData->maGDIData.mpLastContext;
- // Check we have been correctly un-bound from all framebuffers.
- ImplSVData* pSVData = ImplGetSVData();
- rtl::Reference<OpenGLContext> pContext =
pSVData->maGDIData.mpLastContext;
- if( pContext.is() )
- {
- pContext->makeCurrent();
- pContext->UnbindTextureFromFramebuffers( mnTexture );
- }
+ if( pContext.is() )
+ {
+ pContext->makeCurrent();
+ pContext->UnbindTextureFromFramebuffers( mnTexture );
+ }
- if( mnOptStencil != 0 )
+ if( mnOptStencil != 0 )
+ {
+ glDeleteRenderbuffers( 1, &mnOptStencil );
+ mnOptStencil = 0;
+ }
+ glDeleteTextures( 1, &mnTexture );
+
+ mnTexture = 0;
+ }
+ else
{
- glDeleteRenderbuffers( 1, &mnOptStencil );
mnOptStencil = 0;
+ mnTexture = 0;
}
- glDeleteTextures( 1, &mnTexture );
- mnTexture = 0;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
