diff options
| author | dyen <dyen@chromium.org> | 2015-07-09 15:30:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-09 22:31:45 +0000 |
| commit | 639959ffd9a3aaa65feacbeafee60cef5b2367ca (patch) | |
| tree | ca669e042e62cd8eac4761a5fba8e2676cbd5c6a /mojo/gpu | |
| parent | a6fd7d0cf75595cfbc3478d7bd8e6c5a1b17b4fe (diff) | |
| download | chromium_src-639959ffd9a3aaa65feacbeafee60cef5b2367ca.zip chromium_src-639959ffd9a3aaa65feacbeafee60cef5b2367ca.tar.gz chromium_src-639959ffd9a3aaa65feacbeafee60cef5b2367ca.tar.bz2 | |
Revert of revert of time elapsed queries through command buffer.
The original CL was thought to have caused a crash, but it was found to
be merely changing the callstack for an already existing crash.
Original issue's description:
> Added support for Time Elapsed queries through the command buffer.
>
> This CL adds support for Time Elapsed queries through the command
> buffer.
>
> Since it was easy to support, I have also added support
> for getting the current TimeStamp through GetInteger64(),
> GetInteger()...etc. Note that this is different from getting the
> GPU timestamp using QueryCounter which is asynchronous.
>
> BUG=345227
> TEST=trybots
>
> Committed: https://crrev.com/1b6a2940fcb25df247b9f8b795e84e1ca5742904
> Cr-Commit-Position: refs/heads/master@{#336743}
This reverts commit 6c3e20e4fccf530aea0f519532cc6a3a067051c5.
BUG=345227, 506120
TEST=trybots
Review URL: https://codereview.chromium.org/1225353002
Cr-Commit-Position: refs/heads/master@{#338170}
Diffstat (limited to 'mojo/gpu')
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.cc | 5 | ||||
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc index 2b54de9..8b068c7 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.cc +++ b/mojo/gpu/mojo_gles2_impl_autogen.cc @@ -1283,6 +1283,11 @@ void MojoGLES2Impl::GetQueryObjectuivEXT(GLuint id, MojoGLES2MakeCurrent(context_); glGetQueryObjectuivEXT(id, pname, params); } +void MojoGLES2Impl::GetQueryObjectui64vEXT(GLuint id, + GLenum pname, + GLuint64* params) { + NOTREACHED() << "Unimplemented GetQueryObjectui64vEXT."; +} void MojoGLES2Impl::InsertEventMarkerEXT(GLsizei length, const GLchar* marker) { NOTREACHED() << "Unimplemented InsertEventMarkerEXT."; } diff --git a/mojo/gpu/mojo_gles2_impl_autogen.h b/mojo/gpu/mojo_gles2_impl_autogen.h index 92eb9c0..32d9e2a 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.h +++ b/mojo/gpu/mojo_gles2_impl_autogen.h @@ -602,6 +602,9 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface { void EndTransformFeedback() override; void GetQueryivEXT(GLenum target, GLenum pname, GLint* params) override; void GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* params) override; + void GetQueryObjectui64vEXT(GLuint id, + GLenum pname, + GLuint64* params) override; void InsertEventMarkerEXT(GLsizei length, const GLchar* marker) override; void PushGroupMarkerEXT(GLsizei length, const GLchar* marker) override; void PopGroupMarkerEXT() override; |