GRAPHICS: Use the new frame locking mechanism

xoreos · Feb 4, 2014 · 98fe5f3 · 98fe5f3
1 parent 3acce33
commit 98fe5f3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 12 deletions.
diff --git a/src/graphics/aurora/model.cpp b/src/graphics/aurora/model.cpp
@@ -39,6 +39,7 @@
 #include "common/stream.h"
 #include "common/uuid.h"
 
+#include "graphics/graphics.h"
 #include "graphics/util.h"
 #include "graphics/meshutil.h"
 #include "graphics/materialman.h"

diff --git a/src/graphics/graphics.h b/src/graphics/graphics.h
@@ -44,7 +44,7 @@
 /** Macro to lock the SceneManager / frame rendering for the remainder of the current scope.
     Note: To avoid deadlocks, never use the RequestManager to force a function to run in the
           main thread after the SceneManager has been locked! */
-#define LOCK_FRAME() OGRE_LOCK_MUTEX(Ogre::Root::getSingleton().getSceneManager("world")->sceneGraphMutex)
+#define LOCK_FRAME() ::Graphics::FrameLocker xoreosFrameLocker;
 
 namespace Common {
 	class UString;

diff --git a/src/graphics/renderable.cpp b/src/graphics/renderable.cpp
@@ -34,6 +34,7 @@
 
 #include "common/threads.h"
 
+#include "graphics/graphics.h"
 #include "graphics/util.h"
 #include "graphics/renderable.h"
 #include "graphics/materialman.h"

diff --git a/src/graphics/renderer.cpp b/src/graphics/renderer.cpp
@@ -82,8 +82,6 @@ class OgreAnimator : public Ogre::FrameListener {
 	}
 
 	bool frameRenderingQueued(const Ogre::FrameEvent &event) {
-		LOCK_FRAME();
-
 		_currentFPS++;
 		if ((_currentFPSTime += event.timeSinceLastFrame) >= 1.0) {
 			_lastFPS = _currentFPS / _currentFPSTime;

diff --git a/src/graphics/util.h b/src/graphics/util.h
@@ -39,6 +39,8 @@
 #include "common/ustring.h"
 #include "common/maths.h"
 
+#define LOCK_SCENE() OGRE_LOCK_MUTEX(Ogre::Root::getSingleton().getSceneManager("world")->sceneGraphMutex)
+
 namespace Graphics {
 
 static inline Ogre::SceneManager &getOgreSceneManager(const Common::UString &name = "world") {
@@ -128,9 +130,4 @@ static inline uint32 deSwizzleOffset(uint32 x, uint32 y, uint32 width, uint32 he
 
 } // End of namespace Graphics
 
-/** Macro to lock the SceneManager / frame rendering for the remainder of the current scope.
-    Note: To avoid deadlocks, never use the RequestManager to force a function to run in the
-          main thread after the SceneManager has been locked! */
-#define LOCK_FRAME() OGRE_LOCK_MUTEX(Graphics::getOgreSceneManager().sceneGraphMutex)
-
 #endif // GRAPHICS_UTIL_H
diff --git a/src/video/aurora/videoplayer.cpp b/src/video/aurora/videoplayer.cpp
@@ -135,8 +135,6 @@ class VideoFrameRenderer : public Ogre::FrameListener {
 	}
 
 	void createOverlay() {
-		LOCK_FRAME();
-
 		// Dimensions and coordinates
 
 		int scaledWidth, scaledHeight;
@@ -208,8 +206,6 @@ class VideoFrameRenderer : public Ogre::FrameListener {
 	}
 
 	bool frameRenderingQueued(const Ogre::FrameEvent &event) {
-		LOCK_FRAME();
-
 		if (!_overlay)
 			createOverlay();