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

Unified Diff: ui/gl/gl_fence_arb.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_arb.h ('k') | ui/gl/gl_fence_egl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_fence_arb.cc
diff --git a/ui/gl/gl_fence_arb.cc b/ui/gl/gl_fence_arb.cc
index 05bda6b588f2eb219ae2abfcda444070a7a469cf..5c6b3371108bc8ba0823d405958ba19ab78b6b4c 100644
--- a/ui/gl/gl_fence_arb.cc
+++ b/ui/gl/gl_fence_arb.cc
@@ -6,7 +6,6 @@
#include "base/strings/stringprintf.h"
#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_context.h"
namespace gfx {
@@ -24,14 +23,10 @@ std::string GetGLErrors() {
} // namespace
-GLFenceARB::GLFenceARB(bool flush) {
+GLFenceARB::GLFenceARB() {
sync_ = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
DCHECK_EQ(GL_TRUE, glIsSync(sync_));
- if (flush) {
- glFlush();
- } else {
- flush_event_ = GLContext::GetCurrent()->SignalFlush();
- }
+ glFlush();
}
bool GLFenceARB::HasCompleted() {
@@ -52,25 +47,17 @@ bool GLFenceARB::HasCompleted() {
void GLFenceARB::ClientWait() {
DCHECK_EQ(GL_TRUE, glIsSync(sync_));
- if (!flush_event_.get() || flush_event_->IsSignaled()) {
- GLenum result =
- glClientWaitSync(sync_, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
- DCHECK_NE(static_cast<GLenum>(GL_TIMEOUT_EXPIRED), result);
- if (result == GL_WAIT_FAILED) {
- LOG(FATAL) << "Failed to wait for GLFence. error code:" << GetGLErrors();
- }
- } else {
- LOG(ERROR) << "Trying to wait for uncommitted fence. Skipping...";
+ GLenum result =
+ glClientWaitSync(sync_, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
+ DCHECK_NE(static_cast<GLenum>(GL_TIMEOUT_EXPIRED), result);
+ if (result == GL_WAIT_FAILED) {
+ LOG(FATAL) << "Failed to wait for GLFence. error code:" << GetGLErrors();
}
}
void GLFenceARB::ServerWait() {
DCHECK_EQ(GL_TRUE, glIsSync(sync_));
- if (!flush_event_.get() || flush_event_->IsSignaled()) {
- glWaitSync(sync_, 0, GL_TIMEOUT_IGNORED);
- } else {
- LOG(ERROR) << "Trying to wait for uncommitted fence. Skipping...";
- }
+ glWaitSync(sync_, 0, GL_TIMEOUT_IGNORED);
}
GLFenceARB::~GLFenceARB() {
« no previous file with comments | « ui/gl/gl_fence_arb.h ('k') | ui/gl/gl_fence_egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698