[Libreoffice-commits] core.git: include/vcl toolkit/source vcl/source

[Tor Lillqvist]

 include/vcl/opengl/OpenGLWrapper.hxx |    6 ++++++
 include/vcl/openglwin.hxx            |    6 ------
 toolkit/source/awt/vclxtoolkit.cxx   |    4 ++--
 vcl/source/opengl/OpenGLContext.cxx  |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4cd058f3f6568724c65ac88769f17fcc6078da23
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 26 15:15:36 2016 +0200

    OpenGLWrapper is the right place for getBufferSwapCounter()
    
    Change-Id: I3f7db276ab00d5fa493f993736f1010e76fcbcc8

diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx
index e73aa08..3b7f6a7 100644
--- a/include/vcl/opengl/OpenGLWrapper.hxx
+++ b/include/vcl/opengl/OpenGLWrapper.hxx
@@ -23,6 +23,12 @@ struct VCL_DLLPUBLIC OpenGLWrapper
      * Returns true if VCL has OpenGL rendering enabled
      */
     static bool isVCLOpenGLEnabled();
+
+
+    /**
+     * Returns the number of times OpenGL buffers have been swapped.
+     */
+    static sal_Int64 getBufferSwapCounter();
 };
 
 #endif // INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX
diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx
index 9ae5d14..6b2e58d 100644
--- a/include/vcl/openglwin.hxx
+++ b/include/vcl/openglwin.hxx
@@ -48,12 +48,6 @@ public:
     virtual void MouseMove( const MouseEvent& rMEvt ) override;
     virtual void Command( const CommandEvent& rCEvt ) override;
 
-    /**
-     * Returns the number of times OpenGL buffers have been swapped.
-     * Not really any good reason why this is in this class, but...
-     */
-    static sal_Int64 getBufferSwapCounter();
-
 private:
     std::unique_ptr<OpenGLWindowImpl> mxImpl;
     IRenderer* mpRenderer;
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 0053928..a3fed7c 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -98,7 +98,6 @@
 #include <vcl/menubtn.hxx>
 #include <vcl/morebtn.hxx>
 #include <vcl/msgbox.hxx>
-#include <vcl/openglwin.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/spin.hxx>
 #include <vcl/split.hxx>
@@ -114,6 +113,7 @@
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/throbber.hxx>
+#include <vcl/opengl/OpenGLWrapper.hxx>
 #include "toolkit/awt/vclxspinbutton.hxx"
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
@@ -1922,7 +1922,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
 sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter()
     throw (css::uno::RuntimeException, std::exception)
 {
-     return OpenGLWindow::getBufferSwapCounter();
+     return OpenGLWrapper::getBufferSwapCounter();
 }
 
 // css:awt:XToolkitRobot
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index d6458c8..d40564a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -11,7 +11,7 @@
 
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
-#include <vcl/openglwin.hxx>
+#include <vcl/opengl/OpenGLWrapper.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/sysdata.hxx>
 
@@ -1549,7 +1549,7 @@ void OpenGLContext::swapBuffers()
     }
 }
 
-sal_Int64 OpenGLWindow::getBufferSwapCounter()
+sal_Int64 OpenGLWrapper::getBufferSwapCounter()
 {
     return nBufferSwapCounter;
 }