[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 3 commits - Repository.mk vcl/opengl vcl/source

[Markus Mohrhard]

 Repository.mk                       |    6 +++---
 vcl/opengl/gdiimpl.cxx              |    2 +-
 vcl/source/opengl/OpenGLContext.cxx |    2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 6661fdab95b981843f6d8392769f32e7377eaaeb
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 e630bf9..edffab9 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1503,7 +1503,7 @@ void OpenGLSalGraphicsImpl::endPaint()
     if( mnPainting == 0 )
     {
         maContext.makeCurrent();
-        glFlush();
+        maContext.swapBuffers();
     }
 }
 
commit 89cdfaa1ad431ba5cdf75a444a63a7071b2c0624
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 );
commit 2f19b7f5cfacc837974cd253a99bcc69f7d7a4a6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Nov 15 15:48:33 2014 +0100

    Revert "Revert "Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir""""
    
    This reverts commit bf9435bce063da95deb8a52371bce04e7435c966.

diff --git a/Repository.mk b/Repository.mk
index 3d3e35a..e62f632 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -68,9 +68,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
         svpclient \
         pixelctl ) \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
-	$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
-	    outdevgrind) \
-	vcldemo \
 	tiledrendering \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
 ))
@@ -150,6 +147,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	$(if $(filter WNT,$(OS)), \
 		senddoc \
 	) \
+	$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
+	    outdevgrind) \
+	vcldemo \
 ))
 
 ifeq ($(OS),WNT)