diff options
| author | reveman <reveman@chromium.org> | 2015-08-20 06:41:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-20 13:42:18 +0000 |
| commit | 91d23278a61f82e03bf4bac2a5c509579a57edd0 (patch) | |
| tree | 32c3be242f350eb8d0371ae933e287a9b6dc5cc7 /gpu | |
| parent | 976cd0a79e1d21d052813d20f6330ab7d3279558 (diff) | |
| download | chromium_src-91d23278a61f82e03bf4bac2a5c509579a57edd0.zip chromium_src-91d23278a61f82e03bf4bac2a5c509579a57edd0.tar.gz chromium_src-91d23278a61f82e03bf4bac2a5c509579a57edd0.tar.bz2 | |
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
TBR=jamesr@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1230203007
Cr-Commit-Position: refs/heads/master@{#344490}
Diffstat (limited to 'gpu')
| -rwxr-xr-x | gpu/command_buffer/build_gles2_cmd_buffer.py | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/client/cmd_buffer_helper.cc | 3 | ||||
| -rw-r--r-- | gpu/command_buffer/service/query_manager.cc | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 2566923..7962955 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -4006,7 +4006,7 @@ _FUNCTION_INFO = { 'OrderingBarrierCHROMIUM': { 'impl_func': False, 'gen_cmd': False, - 'extension': True, + 'extension': "CHROMIUM_miscellaneous", 'chromium': True, 'client_test': False, }, diff --git a/gpu/command_buffer/client/cmd_buffer_helper.cc b/gpu/command_buffer/client/cmd_buffer_helper.cc index b6306d7..2750903 100644 --- a/gpu/command_buffer/client/cmd_buffer_helper.cc +++ b/gpu/command_buffer/client/cmd_buffer_helper.cc @@ -198,7 +198,8 @@ bool CommandBufferHelper::Finish() { if (put_ == get_offset()) { return true; } - DCHECK(HaveRingBuffer()); + DCHECK(HaveRingBuffer() || + error::IsError(command_buffer_->GetLastState().error)); Flush(); if (!WaitForGetOffsetInRange(put_, put_)) return false; diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc index 49f111f..a269f35 100644 --- a/gpu/command_buffer/service/query_manager.cc +++ b/gpu/command_buffer/service/query_manager.cc @@ -785,6 +785,7 @@ QueryManager::~QueryManager() { } void QueryManager::Destroy(bool have_context) { + active_queries_.clear(); pending_queries_.clear(); pending_transfer_queries_.clear(); active_queries_.clear(); |