diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-01-26 12:31:04 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-26 12:46:35 +0200 |
| commit | 32d98b2551644dea50e58f99ae921a82a0f69753 (patch) | |
| tree | c3541a355edf1461317ccc2c83e89d614a0727e2 /include/vcl | |
| parent | 2c55288357c9d5410afae58c1fbb97cdfabf0360 (diff) | |
Put getBufferSwapCounter() in OpenGLWindow instead
<vcl/openglwin.hxx> is a more light-weight include file and including
that causes less trouble on the various platforms.
Change-Id: I5c9baa171278d291468ef45a47d9fdbc64326957
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/openglwin.hxx | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 2b4af081b755..d5a9e3142173 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -186,9 +186,6 @@ public: /// reset the GL context so this context is not implicit in subsequent GL calls. void resetCurrent(); void swapBuffers(); - - static sal_Int64 getBufferSwapCounter(); - void sync(); void show(); @@ -252,8 +249,6 @@ private: ProgramCollection maPrograms; OpenGLProgram* mpCurrentProgram; - static sal_Int64 mnBufferSwapCounter; - public: vcl::Region maClipRegion; int mnPainting; diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx index 6b2e58dd5c40..9ae5d14b6ff7 100644 --- a/include/vcl/openglwin.hxx +++ b/include/vcl/openglwin.hxx @@ -48,6 +48,12 @@ 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; |