diff options
| author | danakj <danakj@chromium.org> | 2016-03-16 19:41:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 02:42:54 +0000 |
| commit | 97aa5e3544f15ec76416eae93a149dc250c4a647 (patch) | |
| tree | bfa437d751346d573bdd5458c7f5921fb6a56680 /mojo | |
| parent | 66d29099edf0173af60245daa273b0a954d4aa11 (diff) | |
| download | chromium_src-97aa5e3544f15ec76416eae93a149dc250c4a647.zip chromium_src-97aa5e3544f15ec76416eae93a149dc250c4a647.tar.gz chromium_src-97aa5e3544f15ec76416eae93a149dc250c4a647.tar.bz2 | |
Move flush id from WebGraphicsContext3DImpl to GLES2Implementation.
This means calls to any flush or finish methods on GLES2Implementation
will update the flush id, and calls to either
WebGraphicsContext3D::lastFlushID() or to
GLES2Interface::GetLastFlushIdCHROMIUM() will return the same answer
always.
R=kbr@chromium.org, piman
BUG=584497
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1814573002
Cr-Commit-Position: refs/heads/master@{#381647}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.cc | 4 | ||||
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.h | 1 | ||||
| -rw-r--r-- | mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc index 09a0d38..2e0c661 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.cc +++ b/mojo/gpu/mojo_gles2_impl_autogen.cc @@ -1709,6 +1709,10 @@ void MojoGLES2Impl::FlushDriverCachesCHROMIUM() { MojoGLES2MakeCurrent(context_); glFlushDriverCachesCHROMIUM(); } +GLuint MojoGLES2Impl::GetLastFlushIdCHROMIUM() { + MojoGLES2MakeCurrent(context_); + return glGetLastFlushIdCHROMIUM(); +} void MojoGLES2Impl::MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) { MojoGLES2MakeCurrent(context_); glMatrixLoadfCHROMIUM(matrixMode, m); diff --git a/mojo/gpu/mojo_gles2_impl_autogen.h b/mojo/gpu/mojo_gles2_impl_autogen.h index 503e392..bedb8e0 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.h +++ b/mojo/gpu/mojo_gles2_impl_autogen.h @@ -783,6 +783,7 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface { void CommitOverlayPlanesCHROMIUM() override; void SwapInterval(GLint interval) override; void FlushDriverCachesCHROMIUM() override; + GLuint GetLastFlushIdCHROMIUM() override; void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) override; void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) override; GLuint GenPathsCHROMIUM(GLsizei range) override; diff --git a/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h b/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h index 5f04825..5eebe55 100644 --- a/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h +++ b/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h @@ -379,6 +379,7 @@ VISIT_GL_CALL(ScheduleCALayerCHROMIUM, VISIT_GL_CALL(CommitOverlayPlanesCHROMIUM, void, (), ()) VISIT_GL_CALL(SwapInterval, void, (GLint interval), (interval)) VISIT_GL_CALL(FlushDriverCachesCHROMIUM, void, (), ()) +VISIT_GL_CALL(GetLastFlushIdCHROMIUM, GLuint, (), ()) VISIT_GL_CALL(MatrixLoadfCHROMIUM, void, (GLenum matrixMode, const GLfloat* m), |