diff options
Diffstat (limited to 'tools/gpu/gl')
| -rw-r--r-- | tools/gpu/gl/GLTestContext.cpp | 6 | ||||
| -rw-r--r-- | tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/gpu/gl/GLTestContext.cpp b/tools/gpu/gl/GLTestContext.cpp index 87cf724139..68980922cd 100644 --- a/tools/gpu/gl/GLTestContext.cpp +++ b/tools/gpu/gl/GLTestContext.cpp @@ -14,7 +14,7 @@ public: static GLFenceSync* CreateIfSupported(const GLTestContext*); SkPlatformGpuFence SK_WARN_UNUSED_RESULT insertFence() const override; - bool waitFence(SkPlatformGpuFence fence, bool flush) const override; + bool waitFence(SkPlatformGpuFence fence) const override; void deleteFence(SkPlatformGpuFence fence) const override; private: @@ -112,9 +112,9 @@ SkPlatformGpuFence GLTestContext::GLFenceSync::insertFence() const { return fGLFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); } -bool GLTestContext::GLFenceSync::waitFence(SkPlatformGpuFence fence, bool flush) const { +bool GLTestContext::GLFenceSync::waitFence(SkPlatformGpuFence fence) const { GLsync glsync = static_cast<GLsync>(fence); - return GL_WAIT_FAILED != fGLClientWaitSync(glsync, flush ? GL_SYNC_FLUSH_COMMANDS_BIT : 0, -1); + return GL_WAIT_FAILED != fGLClientWaitSync(glsync, GL_SYNC_FLUSH_COMMANDS_BIT, -1); } void GLTestContext::GLFenceSync::deleteFence(SkPlatformGpuFence fence) const { diff --git a/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp b/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp index ae61b337d9..edbc63200b 100644 --- a/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp +++ b/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp @@ -25,7 +25,7 @@ public: static EGLFenceSync* CreateIfSupported(EGLDisplay); SkPlatformGpuFence SK_WARN_UNUSED_RESULT insertFence() const override; - bool waitFence(SkPlatformGpuFence fence, bool flush) const override; + bool waitFence(SkPlatformGpuFence fence) const override; void deleteFence(SkPlatformGpuFence fence) const override; private: @@ -305,12 +305,12 @@ SkPlatformGpuFence EGLFenceSync::insertFence() const { return eglCreateSyncKHR(fDisplay, EGL_SYNC_FENCE_KHR, nullptr); } -bool EGLFenceSync::waitFence(SkPlatformGpuFence platformFence, bool flush) const { +bool EGLFenceSync::waitFence(SkPlatformGpuFence platformFence) const { EGLSyncKHR eglsync = static_cast<EGLSyncKHR>(platformFence); return EGL_CONDITION_SATISFIED_KHR == eglClientWaitSyncKHR(fDisplay, eglsync, - flush ? EGL_SYNC_FLUSH_COMMANDS_BIT_KHR : 0, + EGL_SYNC_FLUSH_COMMANDS_BIT_KHR, EGL_FOREVER_KHR); } |