[Libreoffice-commits] core.git: vcl/inc vcl/opengl

[Tor Lillqvist]

 vcl/inc/openglgdiimpl.hxx |    1 -
 vcl/opengl/gdiimpl.cxx    |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2fc2f752447725ece32ce55d5db21b912902b3cf
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 12 17:11:15 2016 +0200

    Bin unused field
    
    Change-Id: I664e3815bcdaff82a03309ae387154914471a80b

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index df2e914..4e38cb7 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -69,7 +69,6 @@ protected:
     SalGraphics& mrParent;
     /// Pointer to the SalFrame or SalVirtualDevice
     SalGeometryProvider* mpProvider;
-    OpenGLFramebuffer* mpFramebuffer;
     OpenGLProgram* mpProgram;
 
     /// This idle handler is used to swap buffers after rendering.
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 73804c7..fc738ca 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -65,7 +65,6 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, SalGeometryPr
     : mpContext(nullptr)
     , mrParent(rParent)
     , mpProvider(pProvider)
-    , mpFramebuffer(nullptr)
     , mpProgram(nullptr)
     , mpFlush(new OpenGLFlushIdle(this))
     , mbUseScissor(false)
@@ -470,13 +469,13 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
 
         // TODO: lfrb: User GL_ARB_copy_image?
         OpenGLTexture aNewTex = OpenGLTexture( GetWidth(), GetHeight() );
-        mpFramebuffer = mpContext->AcquireFramebuffer( aNewTex );
+        mpContext->AcquireFramebuffer( aNewTex );
         DrawTexture( maOffscreenTex, aPosAry );
         maOffscreenTex = aNewTex;
     }
     else
     {
-        mpFramebuffer = mpContext->AcquireFramebuffer( maOffscreenTex );
+        mpContext->AcquireFramebuffer( maOffscreenTex );
         CHECK_GL_ERROR();
 
         if( bClearTexture )