diff options
Diffstat (limited to 'vcl/opengl/texture.cxx')
-rw-r--r-- | vcl/opengl/texture.cxx | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx index 3b484c00e6e2..1b2e5a7caec6 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; } } |