summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-08-18 14:46:01 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-18 21:46:45 +0000
commitc4967eface72bc99452d8a83800c7cdd19a872ee (patch)
tree82ec25a98e098ab4e18afa46afd7cbdc2f984fe6 /gpu/command_buffer
parent70e489415d055feba858a975443eee2f62e0e88e (diff)
downloadchromium_src-c4967eface72bc99452d8a83800c7cdd19a872ee.zip
chromium_src-c4967eface72bc99452d8a83800c7cdd19a872ee.tar.gz
chromium_src-c4967eface72bc99452d8a83800c7cdd19a872ee.tar.bz2
Revert of Re-land: cc: Use worker context for one-copy tile initialization. (patchset #29 id:560001 of https://codereview.chromium.org/1230203007/ )
Reason for revert: Sorry Dave. I'm reverting as this broke mandoline. To see the breakage build mandoline:all, and run with: mandoline --oopif-always-create-new-frame-tree http://phuang.github.io/iframe.html . We do have mandoline tests that run, but they run with the code path gfx::GLSurfaceTestSupport::InitializeOneOff(), which is why they likely still pass. I'll see about making the tests not run with that config. 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 > TBR=jamesr@chromium.org, sky@chromium.org > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/af0ab609b53c64ce43172be42e20e7ca8beab497 > Cr-Commit-Position: refs/heads/master@{#343947} TBR=jamesr@chromium.org,kbr@chromium.org,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/1298143003 Cr-Commit-Position: refs/heads/master@{#344042}
Diffstat (limited to 'gpu/command_buffer')
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py2
-rw-r--r--gpu/command_buffer/client/cmd_buffer_helper.cc3
-rw-r--r--gpu/command_buffer/service/query_manager.cc1
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();