diff options
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, 2 insertions, 4 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index d6157af..ed7a323 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -3988,7 +3988,7 @@ _FUNCTION_INFO = { 'OrderingBarrierCHROMIUM': { 'impl_func': False, 'gen_cmd': False, - 'extension': "CHROMIUM_miscellaneous", + 'extension': True, '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 2750903..b6306d7 100644 --- a/gpu/command_buffer/client/cmd_buffer_helper.cc +++ b/gpu/command_buffer/client/cmd_buffer_helper.cc @@ -198,8 +198,7 @@ bool CommandBufferHelper::Finish() { if (put_ == get_offset()) { return true; } - DCHECK(HaveRingBuffer() || - error::IsError(command_buffer_->GetLastState().error)); + DCHECK(HaveRingBuffer()); 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 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(); |