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

Unified Diff: ui/gl/gl_fence_apple.cc

Issue 898543002: Remove GLFence::CreateWithoutFlush (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove flush event Created 5 years, 11 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 | « ui/gl/gl_fence_apple.h ('k') | ui/gl/gl_fence_arb.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_fence_apple.cc
diff --git a/ui/gl/gl_fence_apple.cc b/ui/gl/gl_fence_apple.cc
index 9df0cad7e13f9de4ceeef311f127ed1ecd5d9650..3b5f697da50a9cbfc5fc8c5d3aa52c993d9ebdaf 100644
--- a/ui/gl/gl_fence_apple.cc
+++ b/ui/gl/gl_fence_apple.cc
@@ -5,19 +5,14 @@
#include "ui/gl/gl_fence_apple.h"
#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_context.h"
namespace gfx {
-GLFenceAPPLE::GLFenceAPPLE(bool flush) {
+GLFenceAPPLE::GLFenceAPPLE() {
glGenFencesAPPLE(1, &fence_);
glSetFenceAPPLE(fence_);
DCHECK(glIsFenceAPPLE(fence_));
- if (flush) {
- glFlush();
- } else {
- flush_event_ = GLContext::GetCurrent()->SignalFlush();
- }
+ glFlush();
}
bool GLFenceAPPLE::HasCompleted() {
@@ -27,11 +22,7 @@ bool GLFenceAPPLE::HasCompleted() {
void GLFenceAPPLE::ClientWait() {
DCHECK(glIsFenceAPPLE(fence_));
- if (!flush_event_.get() || flush_event_->IsSignaled()) {
- glFinishFenceAPPLE(fence_);
- } else {
- LOG(ERROR) << "Trying to wait for uncommitted fence. Skipping...";
- }
+ glFinishFenceAPPLE(fence_);
}
void GLFenceAPPLE::ServerWait() {
« no previous file with comments | « ui/gl/gl_fence_apple.h ('k') | ui/gl/gl_fence_arb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698