diff options
| author | amineer <amineer@chromium.org> | 2015-07-01 13:29:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-01 20:31:09 +0000 |
| commit | 6c3e20e4fccf530aea0f519532cc6a3a067051c5 (patch) | |
| tree | dc5569623282e4b2e7f83137ac01bd2d07b707c6 /mojo/gpu | |
| parent | 324ef9d027121777efc9ec91a8654436581bf628 (diff) | |
| download | chromium_src-6c3e20e4fccf530aea0f519532cc6a3a067051c5.zip chromium_src-6c3e20e4fccf530aea0f519532cc6a3a067051c5.tar.gz chromium_src-6c3e20e4fccf530aea0f519532cc6a3a067051c5.tar.bz2 | |
Revert of Added support for Time Elapsed queries through the command buffer. (patchset #10 id:180001 of https://codereview.chromium.org/1188013004/)
Reason for revert:
May be causing crashes
BUG=506120
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}
TBR=zmo@chromium.org,sievers@chromium.org,bbudge@chromium.org,kbr@chromium.org,bajones@chromium.org,michaeln@chromium.org,dyen@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=345227
Review URL: https://codereview.chromium.org/1222563003
Cr-Commit-Position: refs/heads/master@{#337108}
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, 0 insertions, 8 deletions
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc index 8b068c7..2b54de9 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.cc +++ b/mojo/gpu/mojo_gles2_impl_autogen.cc @@ -1283,11 +1283,6 @@ 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 32d9e2a..92eb9c0 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.h +++ b/mojo/gpu/mojo_gles2_impl_autogen.h @@ -602,9 +602,6 @@ 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; |