Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(451)

Unified Diff: trunk/src/cc/output/gl_renderer.cc

Issue 299923005: Revert 272565 "Re-land: cc: Fail more visibly when sync queries ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/cc/output/gl_renderer.cc
===================================================================
--- trunk/src/cc/output/gl_renderer.cc (revision 272637)
+++ trunk/src/cc/output/gl_renderer.cc (working copy)
@@ -175,10 +175,6 @@
// 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 @@
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 @@
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698