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

Side by Side 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, 10 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gl/gl_fence_apple.h" 5 #include "ui/gl/gl_fence_apple.h"
6 6
7 #include "ui/gl/gl_bindings.h" 7 #include "ui/gl/gl_bindings.h"
8 #include "ui/gl/gl_context.h"
9 8
10 namespace gfx { 9 namespace gfx {
11 10
12 GLFenceAPPLE::GLFenceAPPLE(bool flush) { 11 GLFenceAPPLE::GLFenceAPPLE() {
13 glGenFencesAPPLE(1, &fence_); 12 glGenFencesAPPLE(1, &fence_);
14 glSetFenceAPPLE(fence_); 13 glSetFenceAPPLE(fence_);
15 DCHECK(glIsFenceAPPLE(fence_)); 14 DCHECK(glIsFenceAPPLE(fence_));
16 if (flush) { 15 glFlush();
17 glFlush();
18 } else {
19 flush_event_ = GLContext::GetCurrent()->SignalFlush();
20 }
21 } 16 }
22 17
23 bool GLFenceAPPLE::HasCompleted() { 18 bool GLFenceAPPLE::HasCompleted() {
24 DCHECK(glIsFenceAPPLE(fence_)); 19 DCHECK(glIsFenceAPPLE(fence_));
25 return !!glTestFenceAPPLE(fence_); 20 return !!glTestFenceAPPLE(fence_);
26 } 21 }
27 22
28 void GLFenceAPPLE::ClientWait() { 23 void GLFenceAPPLE::ClientWait() {
29 DCHECK(glIsFenceAPPLE(fence_)); 24 DCHECK(glIsFenceAPPLE(fence_));
30 if (!flush_event_.get() || flush_event_->IsSignaled()) { 25 glFinishFenceAPPLE(fence_);
31 glFinishFenceAPPLE(fence_);
32 } else {
33 LOG(ERROR) << "Trying to wait for uncommitted fence. Skipping...";
34 }
35 } 26 }
36 27
37 void GLFenceAPPLE::ServerWait() { 28 void GLFenceAPPLE::ServerWait() {
38 DCHECK(glIsFenceAPPLE(fence_)); 29 DCHECK(glIsFenceAPPLE(fence_));
39 ClientWait(); 30 ClientWait();
40 } 31 }
41 32
42 GLFenceAPPLE::~GLFenceAPPLE() { 33 GLFenceAPPLE::~GLFenceAPPLE() {
43 DCHECK(glIsFenceAPPLE(fence_)); 34 DCHECK(glIsFenceAPPLE(fence_));
44 glDeleteFencesAPPLE(1, &fence_); 35 glDeleteFencesAPPLE(1, &fence_);
45 } 36 }
46 37
47 } // namespace gfx 38 } // namespace gfx
OLDNEW
« 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