[Libreoffice-commits] core.git: 6 commits - vcl/opengl vcl/source vcl/unx

[Markus Mohrhard]

 vcl/opengl/salbmp.cxx               |    7 +------
 vcl/source/opengl/OpenGLContext.cxx |    4 +---
 vcl/unx/generic/app/saldisp.cxx     |    2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit f3ff1195cfab0199ebbfda1b1b4f72a78f3093b8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Nov 16 13:40:45 2014 +0100

    remove some useless SAL_WARNs
    
    Change-Id: I26ae7aaab0e2d1685fd9c961aba027e1399b6911

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index ad43ef8..4b5287e 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -200,8 +200,7 @@ bool OpenGLSalBitmap::AllocateUserData()
     }
     if (!alloc)
     {
-        SAL_WARN(
-            "vcl.opengl", "bad alloc " << mnBytesPerRow << "x" << mnHeight);
+        SAL_WARN("vcl.opengl", "bad alloc " << mnBytesPerRow << "x" << mnHeight);
         maUserBuffer.reset( static_cast<sal_uInt8*>(NULL) );
         mnBytesPerRow = 0;
     }
@@ -239,8 +238,6 @@ public:
     ImplPixelFormat8( const BitmapPalette& rPalette )
     : mrPalette( rPalette )
     {
-        if ( mrPalette.GetEntryCount() < 256 )
-            SAL_WARN( "vcl.opengl", "Bad sign, if we get an OOB pixel we die" );
     }
     virtual const BitmapColor& ReadPixel() SAL_OVERRIDE
     {
@@ -262,8 +259,6 @@ public:
         , mnX(0)
         , mnShift(4)
     {
-        if ( mrPalette.GetEntryCount() < 16 )
-            SAL_WARN( "vcl.opengl", "Bad sign, if we get an OOB pixel we die" );
     }
     virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
     {
commit 54189d62363c577b57a7af77f5fadf42fc2ca0b8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Nov 16 12:33:55 2014 +0100

    use correct flag to enable ARB debug version
    
    Change-Id: I933aea4f9cb1ccd58f9a07e7d32ff28077f8bb33

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 15d551a..0659ce5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -865,7 +865,7 @@ bool OpenGLContext::InitGLEW()
     {
         if (glDebugMessageCallbackARB)
         {
-            glEnable(GL_DEBUG_OUTPUT);
+            glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
             glDebugMessageCallbackARB(&debug_callback, NULL);
         }
         else if ( glDebugMessageCallback )
commit b4b1bea816d3d0ee96153c26ad5b5fcc2dfe5972
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Nov 16 11:43:38 2014 +0100

    Revert "make something visible on the screen again"
    
    This reverts commit 6661fdab95b981843f6d8392769f32e7377eaaeb.

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index f8935b7..8532ba0 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1502,7 +1502,7 @@ void OpenGLSalGraphicsImpl::endPaint()
     if( mnPainting == 0 )
     {
         maContext.makeCurrent();
-        maContext.swapBuffers();
+        glFlush();
     }
 }
 
commit 5d5ee7f226d64fb25dbdb817389edc01db86b5eb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Nov 16 11:43:07 2014 +0100

    use the OpenGLHelper version to check for OpenGL support
    
    Change-Id: Ib101d2605e5e739bb1d063fa7019e4e5930462a0

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index ffd12d7..779453e 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -193,7 +193,7 @@ bool SalDisplay::BestVisual( Display     *pDisplay,
         return rVI.visualid == nDefVID;
 
     try {
-        bool bUseOpenGL = officecfg::Office::Common::VCL::UseOpenGL::get();
+        bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled();
         if( bUseOpenGL && OpenGLHelper::GetVisualInfo( pDisplay, nScreen, rVI ) )
             return rVI.visualid == nDefVID;
     }
commit 687ecd9497406617540edbe08efa0f846c94f842
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Nov 15 17:29:33 2014 +0100

    make something visible on the screen again
    
    Why do we still use a double buffered FBC? It apparently works in the
    feature/opengl-vcl branch.
    
    Change-Id: I48b6879b9a9f7fec67f4da25cade46a32d8ad6fa

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 8532ba0..f8935b7 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1502,7 +1502,7 @@ void OpenGLSalGraphicsImpl::endPaint()
     if( mnPainting == 0 )
     {
         maContext.makeCurrent();
-        glFlush();
+        maContext.swapBuffers();
     }
 }
 
commit 6cc2730effeaca3f482e97f8e209a5101f6c9287
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Nov 15 16:48:49 2014 +0100

    remove unnecessary whitespace
    
    Change-Id: I0dda7886718b0e3ff81a0d6d43cca2887877ea9d

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 4f6d130..15d551a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -670,8 +670,6 @@ bool OpenGLContext::ImplInit()
                 GL_TRUE);
     }
 
-
-
     if( m_aGLWin.ctx )
     {
         vShareList.push_back( m_aGLWin.ctx );