diff options
| -rw-r--r-- | vcl/inc/opengl/zone.hxx | 8 | ||||
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx index 8aeabcf8b40f..d4d478bff411 100644 --- a/vcl/inc/opengl/zone.hxx +++ b/vcl/inc/opengl/zone.hxx @@ -29,11 +29,11 @@ class VCL_DLLPUBLIC OpenGLZone { /// how many times have we left a new GL zone static volatile sal_uInt64 gnLeaveCount; - static void enter(); - static void leave(); + static void enter() { gnEnterCount++; } + static void leave() { gnLeaveCount++; } public: - OpenGLZone() { gnEnterCount++; } - ~OpenGLZone() { gnLeaveCount++; } + OpenGLZone() { enter(); } + ~OpenGLZone() { leave(); } static bool isInZone() { return gnEnterCount != gnLeaveCount; } static void hardDisable(); static void relaxWatchdogTimings(); diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index bc9b1c377d13..a179f3710d2c 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -794,9 +794,6 @@ bool OpenGLHelper::supportsVCLOpenGL() return !bDisableGL && !bBlacklisted; } -void OpenGLZone::enter() { gnEnterCount++; } -void OpenGLZone::leave() { gnLeaveCount++; } - namespace { static volatile bool gbWatchdogFiring = false; static osl::Condition* gpWatchdogExit = nullptr; |