make sure not to hold gfx lock while rendering gui and video

popcornmix · Dec 27, 2015 · 9ef475c · 9ef475c
1 parent fa9a4ec
commit 9ef475c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -1921,8 +1921,6 @@ void CApplication::Render()
     }
   }
 
-  CSingleLock lock(g_graphicsContext);
-
   if (g_graphicsContext.IsFullScreenVideo() && m_pPlayer->IsPlaying() && vsync_mode == VSYNC_VIDEO)
     g_Windowing.SetVSync(true);
   else if (vsync_mode == VSYNC_ALWAYS)
@@ -1983,8 +1981,6 @@ void CApplication::Render()
     m_lastRenderTime = now;
   }
 
-  lock.Leave();
-
   if (g_graphicsContext.IsFullScreenVideo())
   {
     g_Windowing.FinishPipeline();

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -1045,6 +1045,8 @@ float CRenderManager::GetMaximumFPS()
 
 void CRenderManager::Render(bool clear, DWORD flags, DWORD alpha, bool gui)
 {
+  CSingleExit exitLock(g_graphicsContext);
+
   CSharedLock lock(m_sharedSection);
 
   if (m_renderState != STATE_CONFIGURED)
@@ -1105,7 +1107,6 @@ bool CRenderManager::IsVideoLayer()
 /* simple present method */
 void CRenderManager::PresentSingle(bool clear, DWORD flags, DWORD alpha)
 {
-  CSingleLock lock(g_graphicsContext);
   SPresent& m = m_Queue[m_presentsource];
 
   if (m.presentfield == FS_BOT)
@@ -1120,7 +1121,6 @@ void CRenderManager::PresentSingle(bool clear, DWORD flags, DWORD alpha)
  * we just render the two fields right after eachother */
 void CRenderManager::PresentFields(bool clear, DWORD flags, DWORD alpha)
 {
-  CSingleLock lock(g_graphicsContext);
   SPresent& m = m_Queue[m_presentsource];
 
   if(m_presentstep == PRESENT_FRAME)
@@ -1141,7 +1141,6 @@ void CRenderManager::PresentFields(bool clear, DWORD flags, DWORD alpha)
 
 void CRenderManager::PresentBlend(bool clear, DWORD flags, DWORD alpha)
 {
-  CSingleLock lock(g_graphicsContext);
   SPresent& m = m_Queue[m_presentsource];
 
   if( m.presentfield == FS_BOT )

diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
@@ -1060,7 +1060,7 @@ void CGUIWindowManager::RenderEx() const
 bool CGUIWindowManager::Render()
 {
   assert(g_application.IsCurrentThread());
-  CSingleLock lock(g_graphicsContext);
+  CSingleExit lock(g_graphicsContext);
 
   CDirtyRegionList dirtyRegions = m_tracker.GetDirtyRegions();