[Libreoffice-commits] core.git: include/vcl vcl/osx vcl/source vcl/unx vcl/win

[Michael Meeks]

 include/vcl/opengl/OpenGLHelper.hxx |    3 ---
 vcl/osx/salframe.cxx                |    5 -----
 vcl/source/opengl/OpenGLHelper.cxx  |    9 ---------
 vcl/unx/generic/window/salframe.cxx |    3 ---
 vcl/unx/gtk/window/gtksalframe.cxx  |    3 ---
 vcl/win/source/window/salframe.cxx  |    3 ---
 6 files changed, 26 deletions(-)

New commits:
commit a7f07e4dfe0acdec7386d28b23e65a5c0efa9d80
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Aug 28 08:03:59 2015 +0100

    Revert "tdf#93530 - the VCL GDI flushing abstraction should glFlush too."
    
    This reverts commit e16e64dd862c8f386f80de43ad68e831e169d49d.
    
    I somehow forgot that glFlush is context specific, (gl always gets
    me that way).

diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index d14df0d..95c23c8 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -67,9 +67,6 @@ public:
      */
     static bool isVCLOpenGLEnabled();
 
-    /// flush the OpenGL command queue - if OpenGL is enabled.
-    static void flush();
-
 #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
     static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo& rVI);
     static GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool& bInverted );
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 8f5fbfd..3882c40 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -28,7 +28,6 @@
 #include "vcl/window.hxx"
 #include "vcl/syswin.hxx"
 #include <vcl/settings.hxx>
-#include <vcl/opengl/OpenGLHelper.hxx>
 
 #include "osx/saldata.hxx"
 #include "quartz/salgdi.h"
@@ -39,7 +38,6 @@
 #include "osx/a11yfactory.h"
 #include "quartz/utils.h"
 
-
 #include "salwtype.hxx"
 
 #include "premac.h"
@@ -883,7 +881,6 @@ void AquaSalFrame::Flush()
     {
         [mpNSView display];
     }
-    OpenGLHelper::flush();
 }
 
 void AquaSalFrame::Flush( const Rectangle& rRect )
@@ -905,7 +902,6 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
     {
         [mpNSView display];
     }
-    OpenGLHelper::flush();
 }
 
 void AquaSalFrame::Sync()
@@ -918,7 +914,6 @@ void AquaSalFrame::Sync()
         [mpNSView setNeedsDisplay: YES];
         [mpNSView display];
     }
-    OpenGLHelper::flush();
 }
 
 void AquaSalFrame::SetInputContext( SalInputContext* pContext )
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index f669fba..2e0dcfd 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -707,13 +707,4 @@ GLXFBConfig OpenGLHelper::GetPixmapFBConfig( Display* pDisplay, bool& bInverted
 
 #endif
 
-void OpenGLHelper::flush()
-{
-    if (!isVCLOpenGLEnabled())
-        return;
-
-    glFlush();
-    CHECK_GL_ERROR();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 43189003..8dacdd8 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -35,7 +35,6 @@
 #include "vcl/settings.hxx"
 #include "vcl/bmpacc.hxx"
 #include "vcl/opengl/OpenGLContext.hxx"
-#include "vcl/opengl/OpenGLHelper.hxx"
 
 #include <prex.h>
 #include <X11/Xatom.h>
@@ -2455,13 +2454,11 @@ void X11SalFrame::SetTitle( const OUString& rTitle )
 void X11SalFrame::Flush()
 {
     XFlush( GetDisplay()->GetDisplay() );
-    OpenGLHelper::flush();
 }
 
 void X11SalFrame::Sync()
 {
     XSync( GetDisplay()->GetDisplay(), False );
-    OpenGLHelper::flush();
 }
 
 // Keyboard
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index b911378..6bc25f3 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -37,7 +37,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/opengl/OpenGLHelper.hxx>
 
 #if !GTK_CHECK_VERSION(3,0,0)
 #  include <unx/x11/xlimits.hxx>
@@ -2935,13 +2934,11 @@ void GtkSalFrame::Flush()
 #else
     XFlush (GDK_DISPLAY_XDISPLAY (getGdkDisplay()));
 #endif
-    OpenGLHelper::flush();
 }
 
 void GtkSalFrame::Sync()
 {
     gdk_display_sync( getGdkDisplay() );
-    OpenGLHelper::flush();
 }
 
 #ifndef GDK_Open
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 8dc8076..4268173 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -46,7 +46,6 @@
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/opengl/OpenGLHelper.hxx>
 
 // Warning in SDK header
 #ifdef _MSC_VER
@@ -2202,13 +2201,11 @@ void WinSalFrame::SetPointerPos( long nX, long nY )
 void WinSalFrame::Flush()
 {
     GdiFlush();
-    OpenGLHelper::flush();
 }
 
 void WinSalFrame::Sync()
 {
     GdiFlush();
-    OpenGLHelper::flush();
 }
 
 static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext )