diff options
| author | danakj <danakj@chromium.org> | 2015-06-08 17:45:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 00:46:50 +0000 |
| commit | b7c7364c8783728bf33dc3edbef59cdce4aefb40 (patch) | |
| tree | 43ab188b2e9f419418b0b2a29e06d8a016127c61 /mojo/gpu | |
| parent | cd3fad6bed38209a5c09e78e5f0fc703d583fc7f (diff) | |
| download | chromium_src-b7c7364c8783728bf33dc3edbef59cdce4aefb40.zip chromium_src-b7c7364c8783728bf33dc3edbef59cdce4aefb40.tar.gz chromium_src-b7c7364c8783728bf33dc3edbef59cdce4aefb40.tar.bz2 | |
DCHECK if shader compilation fails that it's due to context loss.
Add GetGraphicsResetStatusKHR() to GLES2Interface so GLHelper
code can verify this.
Adds IsGpuChannelLost() to GpuControl to tell if the
GpuChannelHost has lost its connection to the GPU process,
which is implemented in CommandBufferProxyImpl.
Uses this along with the GetLastState() on the CommandBuffer
(via CommandBufferHelper::IsContextLost()) to tell if the
context is lost from GLES2Implementation.
R=piman@chromium.org
TBR=sky
BUG=492447
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1160863007
Cr-Commit-Position: refs/heads/master@{#333404}
Diffstat (limited to 'mojo/gpu')
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.cc | 4 | ||||
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc index 2ffcbf1..f3d0131 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.cc +++ b/mojo/gpu/mojo_gles2_impl_autogen.cc @@ -1615,6 +1615,10 @@ void MojoGLES2Impl::MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) { void MojoGLES2Impl::MatrixLoadIdentityCHROMIUM(GLenum matrixMode) { NOTREACHED() << "Unimplemented MatrixLoadIdentityCHROMIUM."; } +GLenum MojoGLES2Impl::GetGraphicsResetStatusKHR() { + NOTREACHED() << "Unimplemented GetGraphicsResetStatusKHR."; + return 0; +} void MojoGLES2Impl::BlendBarrierKHR() { NOTREACHED() << "Unimplemented BlendBarrierKHR."; } diff --git a/mojo/gpu/mojo_gles2_impl_autogen.h b/mojo/gpu/mojo_gles2_impl_autogen.h index 8b242d7..a6746d0 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.h +++ b/mojo/gpu/mojo_gles2_impl_autogen.h @@ -774,6 +774,7 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface { void SwapInterval(GLint interval) override; void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) override; void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) override; + GLenum GetGraphicsResetStatusKHR() override; void BlendBarrierKHR() override; private: |