vcl/opengl/gdiimpl.cxx | 7 +++++++ vcl/workben/vcldemo.cxx | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)
New commits: commit 27953088c5fc8a51cb5c26b0746cb42f56324404 Author: Michael Meeks <michael.me...@collabora.com> Date: Wed Dec 23 13:37:33 2015 +0000 tdf#96690 - don't copy tiny non-rendered-to virtual devices. Change-Id: Ic9d90bb7f652599b5a6ce303aa026b7e4e255324 diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 56da7c1..7cbf73f 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)) commit afb5bd25235ca53a589447680737180a4d0d8cd1 Author: Michael Meeks <michael.me...@collabora.com> Date: Mon Jan 4 11:41:28 2016 +0000 vcldemo: adjust benchmarking weights to fit changed workloads. Change-Id: I2cd8cdd541fd4095aea8abd2ea78b11e7df77440 diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 19e4fe8..4175135 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -569,7 +569,7 @@ public: struct DrawEllipse : public RegionRenderer { - RENDER_DETAILS(ellipse,KEY_E,5000) + RENDER_DETAILS(ellipse,KEY_E,500) virtual void RenderRegion(OutputDevice &rDev, Rectangle r, const RenderContext &rCtx) override { @@ -789,7 +789,7 @@ public: struct DrawClipped : public RegionRenderer { - RENDER_DETAILS(clip,KEY_D,100) + RENDER_DETAILS(clip,KEY_D,10) virtual void RenderRegion(OutputDevice &rDev, Rectangle r, const RenderContext &) override { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits