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 /vcl/source/opengl/OpenGLContext.cxx | |
| 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 'vcl/source/opengl/OpenGLContext.cxx')
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index a1296a99ae97..d6458c8f201c 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -11,6 +11,7 @@ #include <vcl/opengl/OpenGLContext.hxx> #include <vcl/opengl/OpenGLHelper.hxx> +#include <vcl/openglwin.hxx> #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> @@ -50,7 +51,7 @@ static std::vector<GLXContext> g_vShareList; static std::vector<HGLRC> g_vShareList; #endif -sal_Int64 OpenGLContext::mnBufferSwapCounter = 0; +static sal_Int64 nBufferSwapCounter = 0; GLWindow::~GLWindow() { @@ -1537,7 +1538,7 @@ void OpenGLContext::swapBuffers() glXSwapBuffers(m_aGLWin.dpy, m_aGLWin.win); #endif - mnBufferSwapCounter++; + nBufferSwapCounter++; static bool bSleep = getenv("SAL_GL_SLEEP_ON_SWAP"); if (bSleep) @@ -1548,9 +1549,9 @@ void OpenGLContext::swapBuffers() } } -sal_Int64 OpenGLContext::getBufferSwapCounter() +sal_Int64 OpenGLWindow::getBufferSwapCounter() { - return mnBufferSwapCounter; + return nBufferSwapCounter; } void OpenGLContext::sync() |