Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1328)

Unified Diff: cc/gl_renderer.cc

Issue 12220095: cc: Fix resource provider fences and add DCHECKs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bot Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/gl_renderer.cc
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 1b48615a12c70d9a905a4ed3b9166bb1fac04cf0..794d26ef0132ec8fa607836411bd4c7002841e54 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -1309,11 +1309,6 @@ bool GLRenderer::swapBuffers()
TRACE_EVENT0("cc", "GLRenderer::swapBuffers");
// We're done! Time to swapbuffers!
- scoped_refptr<ResourceProvider::Fence> lastSwapFence = m_resourceProvider->getReadLockFence();
- if (lastSwapFence)
- static_cast<SimpleSwapFence*>(lastSwapFence.get())->setHasPassed();
- m_resourceProvider->setReadLockFence(new SimpleSwapFence());
-
if (m_capabilities.usingPartialSwap) {
// If supported, we can save significant bandwidth by only swapping the damaged/scissored region (clamped to the viewport)
m_swapBufferRect.Intersect(gfx::Rect(gfx::Point(), viewportSize()));
@@ -1327,6 +1322,14 @@ bool GLRenderer::swapBuffers()
m_swapBufferRect = gfx::Rect();
+ // We don't have real fences, so we mark read fences as passed
+ // assuming a double-buffered GPU pipeline. A texture can be
+ // written to after one full frame has past since it was last read.
+ if (m_lastSwapFence)
+ static_cast<SimpleSwapFence*>(m_lastSwapFence.get())->setHasPassed();
+ m_lastSwapFence = m_resourceProvider->getReadLockFence();
+ m_resourceProvider->setReadLockFence(new SimpleSwapFence());
+
return true;
}

Powered by Google App Engine
This is Rietveld 408576698