diff options
-rw-r--r-- | include/vcl/opengl/OpenGLHelper.hxx | 3 | ||||
-rw-r--r-- | vcl/osx/salframe.cxx | 5 | ||||
-rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 9 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 3 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 3 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 3 |
6 files changed, 0 insertions, 26 deletions
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index d14df0d2b192..95c23c8deeaa 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 8f5fbfd726a4..3882c4023824 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 f669fbaefeb7..2e0dcfd4e0ef 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 43189003cec7..8dacdd8bf772 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 b911378dc25e..6bc25f3fd06b 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 8dc807690118..42681731817d 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 ) |