summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-12-23 13:37:33 +0000
committerTor Lillqvist <tml@collabora.com>2016-01-05 09:10:07 +0000
commite66076c33b5875e68167b53fd9d663f4abd566c8 (patch)
tree1c832827ace646021cdadf87f53bc022f20f942f
parentf284ec139beb920486e8351f9e758966969349ab (diff)
tdf#96690 - don't copy tiny non-rendered-to virtual devices.
Change-Id: Ic9d90bb7f652599b5a6ce303aa026b7e4e255324 Reviewed-on: https://gerrit.libreoffice.org/21091 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--vcl/opengl/gdiimpl.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 73a2c82913bb..c236125b482c 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1649,6 +1649,13 @@ void OpenGLSalGraphicsImpl::DoCopyBits( const SalTwoRect& rPosAry, OpenGLSalGrap
{
VCL_GL_INFO( "::copyBits" );
+ if( !rImpl.maOffscreenTex )
+ {
+ VCL_GL_INFO( "::copyBits - skipping copy of un-initialized framebuffer contents of size "
+ << rImpl.GetWidth() << "x" << rImpl.GetHeight() );
+ return;
+ }
+
if( &rImpl == this &&
(rPosAry.mnSrcWidth == rPosAry.mnDestWidth) &&
(rPosAry.mnSrcHeight == rPosAry.mnDestHeight))