| OLD | NEW |
| 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_egl.h" | 5 #include "ui/gl/gl_fence_egl.h" |
| 6 | 6 |
| 7 #include "ui/gl/egl_util.h" | 7 #include "ui/gl/egl_util.h" |
| 8 #include "ui/gl/gl_bindings.h" | 8 #include "ui/gl/gl_bindings.h" |
| 9 | 9 |
| 10 namespace gfx { | 10 namespace gfx { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 } | 37 } |
| 38 | 38 |
| 39 DCHECK(value == EGL_SIGNALED_KHR || value == EGL_UNSIGNALED_KHR); | 39 DCHECK(value == EGL_SIGNALED_KHR || value == EGL_UNSIGNALED_KHR); |
| 40 return !value || value == EGL_SIGNALED_KHR; | 40 return !value || value == EGL_SIGNALED_KHR; |
| 41 } | 41 } |
| 42 | 42 |
| 43 void GLFenceEGL::ClientWait() { | 43 void GLFenceEGL::ClientWait() { |
| 44 EGLint flags = 0; | 44 EGLint flags = 0; |
| 45 EGLTimeKHR time = EGL_FOREVER_KHR; | 45 EGLTimeKHR time = EGL_FOREVER_KHR; |
| 46 EGLint result = eglClientWaitSyncKHR(display_, sync_, flags, time); | 46 EGLint result = eglClientWaitSyncKHR(display_, sync_, flags, time); |
| 47 DCHECK_IMPLIES(!g_ignore_egl_sync_failures, | 47 DCHECK(g_ignore_egl_sync_failures || EGL_TIMEOUT_EXPIRED_KHR != result); |
| 48 EGL_TIMEOUT_EXPIRED_KHR != result); | |
| 49 if (result == EGL_FALSE) { | 48 if (result == EGL_FALSE) { |
| 50 LOG(ERROR) << "Failed to wait for EGLSync. error:" | 49 LOG(ERROR) << "Failed to wait for EGLSync. error:" |
| 51 << ui::GetLastEGLErrorString(); | 50 << ui::GetLastEGLErrorString(); |
| 52 CHECK(g_ignore_egl_sync_failures); | 51 CHECK(g_ignore_egl_sync_failures); |
| 53 } | 52 } |
| 54 } | 53 } |
| 55 | 54 |
| 56 void GLFenceEGL::ServerWait() { | 55 void GLFenceEGL::ServerWait() { |
| 57 if (!gfx::g_driver_egl.ext.b_EGL_KHR_wait_sync) { | 56 if (!gfx::g_driver_egl.ext.b_EGL_KHR_wait_sync) { |
| 58 ClientWait(); | 57 ClientWait(); |
| 59 return; | 58 return; |
| 60 } | 59 } |
| 61 EGLint flags = 0; | 60 EGLint flags = 0; |
| 62 if (eglWaitSyncKHR(display_, sync_, flags) == EGL_FALSE) { | 61 if (eglWaitSyncKHR(display_, sync_, flags) == EGL_FALSE) { |
| 63 LOG(ERROR) << "Failed to wait for EGLSync. error:" | 62 LOG(ERROR) << "Failed to wait for EGLSync. error:" |
| 64 << ui::GetLastEGLErrorString(); | 63 << ui::GetLastEGLErrorString(); |
| 65 CHECK(g_ignore_egl_sync_failures); | 64 CHECK(g_ignore_egl_sync_failures); |
| 66 } | 65 } |
| 67 } | 66 } |
| 68 | 67 |
| 69 GLFenceEGL::~GLFenceEGL() { | 68 GLFenceEGL::~GLFenceEGL() { |
| 70 eglDestroySyncKHR(display_, sync_); | 69 eglDestroySyncKHR(display_, sync_); |
| 71 } | 70 } |
| 72 | 71 |
| 73 } // namespace gfx | 72 } // namespace gfx |
| OLD | NEW |