summaryrefslogtreecommitdiffstats
path: root/cc/output/gl_renderer.cc
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-14 18:03:40 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-14 18:03:40 +0000
commit293de0ef5c5eed5add31b0aa5f7559cc511245f4 (patch)
tree146ca58baff240b56aba42089c6e57a55acf49ed /cc/output/gl_renderer.cc
parentb54cc912e6d8220b1f9583691d9611cd1c15ebc2 (diff)
downloadchromium_src-293de0ef5c5eed5add31b0aa5f7559cc511245f4.zip
chromium_src-293de0ef5c5eed5add31b0aa5f7559cc511245f4.tar.gz
chromium_src-293de0ef5c5eed5add31b0aa5f7559cc511245f4.tar.bz2
Revert 270265 "cc: Fail more visibly when sync queries are not w..."
Caused win_gpu_triggered_tests to fail most of the time. See Issue 373360. BUG=371530,373360 > cc: Fail more visibly when sync queries are not working correctly. > > Instead of creating an infinite number of sync queries, which will > eventually cause performance issues, log an error message and block > until oldest query has passed when reaching 16 pending queries. > > BUG=371530 > > Review URL: https://codereview.chromium.org/280543003 TBR=reveman@chromium.org Review URL: https://codereview.chromium.org/285973002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/gl_renderer.cc')
-rw-r--r--cc/output/gl_renderer.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index df3ddfd..8e60f94 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -175,10 +175,6 @@ SamplerType SamplerTypeFromTextureTarget(GLenum target) {
// determine when anti-aliasing is unnecessary.
const float kAntiAliasingEpsilon = 1.0f / 1024.0f;
-// Block or crash if the number of pending sync queries reach this high as
-// something is seriously wrong on the service side if this happens.
-const size_t kMaxPendingSyncQueries = 16;
-
} // anonymous namespace
class GLRenderer::ScopedUseGrContext {
@@ -252,11 +248,6 @@ class GLRenderer::SyncQuery {
return !available;
}
- void Wait() {
- unsigned result = 0;
- gl_->GetQueryObjectuivEXT(query_id_, GL_QUERY_RESULT_EXT, &result);
- }
-
private:
class Fence : public ResourceProvider::Fence {
public:
@@ -450,15 +441,6 @@ void GLRenderer::BeginDrawingFrame(DrawingFrame* frame) {
scoped_refptr<ResourceProvider::Fence> read_lock_fence;
if (use_sync_query_) {
- // Block until oldest sync query has passed if the number of pending queries
- // ever reach kMaxPendingSyncQueries.
- if (pending_sync_queries_.size() >= kMaxPendingSyncQueries) {
- LOG(ERROR) << "Reached limit of pending sync queries.";
-
- pending_sync_queries_.front()->Wait();
- DCHECK(!pending_sync_queries_.front()->IsPending());
- }
-
while (!pending_sync_queries_.empty()) {
if (pending_sync_queries_.front()->IsPending())
break;