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

Unified Diff: cc/resource_update_controller.cc

Issue 11622008: cc: Defer texture allocation (to allow async allocations). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase. Rebase test fixes. Created 7 years, 11 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
« no previous file with comments | « cc/resource_provider_unittest.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_update_controller.cc
diff --git a/cc/resource_update_controller.cc b/cc/resource_update_controller.cc
index 9c35f8be6e91554ddbbd15c582ba34d1f30de095..1177d5372fcaa69b0d8012bf20243bdc572c23e9 100644
--- a/cc/resource_update_controller.cc
+++ b/cc/resource_update_controller.cc
@@ -141,9 +141,9 @@ void ResourceUpdateController::updateTexture(ResourceUpdate update)
// is available in other shared contexts. It is important to do here
// because the backing texture is created in one context while it is
// being written to in another.
- m_resourceProvider->flush();
ResourceProvider::ScopedWriteLockGL lock(
m_resourceProvider, texture->resourceId());
+ m_resourceProvider->flush();
// Make sure ganesh uses the correct GL context.
paintContext->makeContextCurrent();
« no previous file with comments | « cc/resource_provider_unittest.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698