[Libreoffice-commits] core.git: Branch 'feature/fixes7' - 3 commits - vcl/opengl

[Lubosz Sarnecki]

 vcl/opengl/gdiimpl.cxx |   19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 35e76ef702f18793c45411df5b7a179555b1ff66
Author: Lubosz Sarnecki <lubosz.sarnecki at collabora.co.uk>
Date:   Thu Aug 20 17:03:31 2015 +0200

    vcl opengl: performance experiment: do not use stencil test
    
    Change-Id: I7ac79e1e267927da3bc177cfdb014bc0e9b32b50

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index aab0012..23398bc 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -175,8 +175,6 @@ void OpenGLSalGraphicsImpl::PostDraw()
 {
     //if( !mbOffscreen && mpContext->mnPainting == 0 )
     //    glFlush();
-    if( mbUseStencil )
-        glDisable( GL_STENCIL_TEST );
 
     if( mpProgram )
     {
@@ -246,11 +244,6 @@ void OpenGLSalGraphicsImpl::ImplInitClipRegion()
             ImplSetClipBit( maClipRegion, 0x01 );
         }
     }
-    if( mbUseStencil )
-    {
-        glStencilFunc( GL_EQUAL, 1, 0x1 );
-        glEnable( GL_STENCIL_TEST );
-    }
 
     CHECK_GL_ERROR();
 }
commit f07d35732be6978c9cb856049eae5a586ba9b700
Author: Lubosz Sarnecki <lubosz.sarnecki at collabora.co.uk>
Date:   Thu Aug 20 17:02:50 2015 +0200

    vcl opengl: performance experiment: do not use scissor test
    
    Change-Id: Ia51e6c6a22d42d468c6afd8b1aa6a73b4f042b42

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 0d89358..aab0012 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -175,10 +175,9 @@ void OpenGLSalGraphicsImpl::PostDraw()
 {
     //if( !mbOffscreen && mpContext->mnPainting == 0 )
     //    glFlush();
-    if( mbUseScissor )
-        glDisable( GL_SCISSOR_TEST );
     if( mbUseStencil )
         glDisable( GL_STENCIL_TEST );
+
     if( mpProgram )
     {
         mpProgram->Clean();
@@ -247,9 +246,6 @@ void OpenGLSalGraphicsImpl::ImplInitClipRegion()
             ImplSetClipBit( maClipRegion, 0x01 );
         }
     }
-
-    if( mbUseScissor )
-        glEnable( GL_SCISSOR_TEST );
     if( mbUseStencil )
     {
         glStencilFunc( GL_EQUAL, 1, 0x1 );
commit 946d2bd37261d8c61b9ddb05ce2267bc2002fbad
Author: Lubosz Sarnecki <lubosz.sarnecki at collabora.co.uk>
Date:   Thu Aug 20 16:31:38 2015 +0200

    vcl opengl: performance experiment: do not use glFlush
    
    Change-Id: I5c5f6388e45f5b03ae0dff4ea244a5d9a38c9838

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index db2ea85..0d89358 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -173,8 +173,8 @@ void OpenGLSalGraphicsImpl::PreDraw()
 
 void OpenGLSalGraphicsImpl::PostDraw()
 {
-    if( !mbOffscreen && mpContext->mnPainting == 0 )
-        glFlush();
+    //if( !mbOffscreen && mpContext->mnPainting == 0 )
+    //    glFlush();
     if( mbUseScissor )
         glDisable( GL_SCISSOR_TEST );
     if( mbUseStencil )
@@ -1828,7 +1828,7 @@ void OpenGLSalGraphicsImpl::endPaint()
     {
         mpContext->makeCurrent();
         mpContext->AcquireDefaultFramebuffer();
-        glFlush();
+        //glFlush();
         mpContext->swapBuffers();
     }