summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorkbr <kbr@chromium.org>2015-08-09 15:29:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-09 22:29:39 +0000
commitfc6ad471b796214148d81208b38601de0c86bc9f (patch)
tree9a8fd50c6d252c7b8ed9706c25e18351044eb697 /gpu/command_buffer
parenta6b998600660f34bcce9fbc2c75bbc0a3f7f03cc (diff)
downloadchromium_src-fc6ad471b796214148d81208b38601de0c86bc9f.zip
chromium_src-fc6ad471b796214148d81208b38601de0c86bc9f.tar.gz
chromium_src-fc6ad471b796214148d81208b38601de0c86bc9f.tar.bz2
Revert of Re-land: cc: Use worker context for one-copy tile initialization. (patchset #22 id:420001 of https://codereview.chromium.org/1230203007/ )
Reason for revert: I'm sorry, but this patch definitely causes failures of one of the context_lost tests on Windows on multiple bots as described in https://code.google.com/p/chromium/issues/detail?id=490295#c15 . I'm sorry the CQ isn't catching these, and I'm not sure why it isn't -- but it's important to fix these failures rather than leaving them on the tree. Original issue's description: > Re-land: cc: Use worker context for one-copy tile initialization. > > This moves management of staging resources to > OneCopyTileTaskWorkerPool class. This makes it possible > to use a worker context to issue and detect when copy > operations complete. > > BUG=490295 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/a6b998600660f34bcce9fbc2c75bbc0a3f7f03cc > Cr-Commit-Position: refs/heads/master@{#342567} TBR=piman@chromium.org,primiano@chromium.org,vmiura@chromium.org,vmpstr@chromium.org,reveman@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=490295 Review URL: https://codereview.chromium.org/1282183002 Cr-Commit-Position: refs/heads/master@{#342568}
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r--gpu/command_buffer/service/query_manager.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc
index a269f35..49f111f 100644
--- a/gpu/command_buffer/service/query_manager.cc
+++ b/gpu/command_buffer/service/query_manager.cc
@@ -785,7 +785,6 @@ QueryManager::~QueryManager() {
}
void QueryManager::Destroy(bool have_context) {
- active_queries_.clear();
pending_queries_.clear();
pending_transfer_queries_.clear();
active_queries_.clear();