| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| index 7510160832663b524ec93d85f3388a543261935e..81ecee496c9c70038085eb2f2be1fe5c023cf8ab 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -514,6 +514,8 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
|
| virtual bool GetServiceTextureId(uint32 client_texture_id,
|
| uint32* service_texture_id);
|
|
|
| + virtual uint32 GetGLError() OVERRIDE;
|
| +
|
| // Restores the current state to the user's settings.
|
| void RestoreCurrentFramebufferBindings();
|
| void RestoreCurrentRenderbufferBindings();
|
| @@ -1176,9 +1178,6 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
|
| // false if pname is unknown.
|
| bool GetNumValuesReturnedForGLGet(GLenum pname, GLsizei* num_values);
|
|
|
| - // Gets the GLError through our wrapper.
|
| - GLenum GetGLError();
|
| -
|
| // Gets the GLError and stores it in our wrapper. Effectively
|
| // this lets us peek at the error without losing it.
|
| GLenum PeekGLError();
|
| @@ -5046,7 +5045,7 @@ void GLES2DecoderImpl::DoUseProgram(GLuint program) {
|
| }
|
| }
|
|
|
| -GLenum GLES2DecoderImpl::GetGLError() {
|
| +uint32 GLES2DecoderImpl::GetGLError() {
|
| // Check the GL error first, then our wrapped error.
|
| GLenum error = glGetError();
|
| if (error == GL_NO_ERROR && error_bits_ != 0) {
|
|
|