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

Unified Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/client/gles2_implementation.cc
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 2dd95ec410850613d8279ef3ba12b7d0bb884469..e8537669a790e4239f6973d07343d51e226dc593 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -4930,39 +4930,6 @@ void GLES2Implementation::UniformBlockBinding(GLuint program,
CheckGLError();
}
-GLenum GLES2Implementation::ClientWaitSync(
- GLsync sync, GLbitfield flags, GLuint64 timeout) {
- GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glClientWaitSync(" << sync
- << ", " << flags << ", " << timeout << ")");
- typedef cmds::ClientWaitSync::Result Result;
- Result* result = GetResultAs<Result*>();
- if (!result) {
- SetGLError(GL_OUT_OF_MEMORY, "ClientWaitSync", "");
- return GL_WAIT_FAILED;
- }
- *result = GL_WAIT_FAILED;
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(timeout, &v32_0, &v32_1);
- helper_->ClientWaitSync(
- ToGLuint(sync), flags, v32_0, v32_1,
- GetResultShmId(), GetResultShmOffset());
- WaitForCmd();
- GPU_CLIENT_LOG("returned " << *result);
- CheckGLError();
- return *result;
-}
-
-void GLES2Implementation::WaitSync(
- GLsync sync, GLbitfield flags, GLuint64 timeout) {
- GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glWaitSync(" << sync << ", "
- << flags << ", " << timeout << ")");
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(timeout, &v32_0, &v32_1);
- helper_->WaitSync(ToGLuint(sync), flags, v32_0, v32_1);
- CheckGLError();
-}
// Include the auto-generated part of this file. We split this because it means
// we can easily edit the non-auto generated parts right here in this file
« no previous file with comments | « gpu/command_buffer/client/gles2_cmd_helper_autogen.h ('k') | gpu/command_buffer/client/gles2_implementation_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698