| Index: gpu/command_buffer/service/error_state.cc
|
| diff --git a/gpu/command_buffer/service/error_state.cc b/gpu/command_buffer/service/error_state.cc
|
| index 524ea4f79ec770374f0e3feeb2af1e95e41221f8..3468c7e7c615d4b9d6cfda1e05611155eeafd392 100644
|
| --- a/gpu/command_buffer/service/error_state.cc
|
| +++ b/gpu/command_buffer/service/error_state.cc
|
| @@ -33,13 +33,20 @@ class ErrorStateImpl : public ErrorState {
|
| const char* function_name,
|
| unsigned int value,
|
| const char* label) OVERRIDE;
|
| - virtual void SetGLErrorInvalidParam(
|
| + virtual void SetGLErrorInvalidParami(
|
| const char* filename,
|
| int line,
|
| unsigned int error,
|
| const char* function_name,
|
| unsigned int pname,
|
| int param) OVERRIDE;
|
| + virtual void SetGLErrorInvalidParamf(
|
| + const char* filename,
|
| + int line,
|
| + unsigned int error,
|
| + const char* function_name,
|
| + unsigned int pname,
|
| + float param) OVERRIDE;
|
|
|
| virtual unsigned int PeekGLError(
|
| const char* filename, int line, const char* function_name) OVERRIDE;
|
| @@ -131,7 +138,7 @@ void ErrorStateImpl::SetGLErrorInvalidEnum(
|
| GLES2Util::GetStringEnum(value)).c_str());
|
| }
|
|
|
| -void ErrorStateImpl::SetGLErrorInvalidParam(
|
| +void ErrorStateImpl::SetGLErrorInvalidParami(
|
| const char* filename,
|
| int line,
|
| unsigned int error,
|
| @@ -152,6 +159,19 @@ void ErrorStateImpl::SetGLErrorInvalidParam(
|
| }
|
| }
|
|
|
| +void ErrorStateImpl::SetGLErrorInvalidParamf(
|
| + const char* filename,
|
| + int line,
|
| + unsigned int error,
|
| + const char* function_name,
|
| + unsigned int pname, float param) {
|
| + SetGLError(
|
| + filename, line, error, function_name,
|
| + (std::string("trying to set ") +
|
| + GLES2Util::GetStringEnum(pname) + " to " +
|
| + base::StringPrintf("%G", param)).c_str());
|
| +}
|
| +
|
| void ErrorStateImpl::CopyRealGLErrorsToWrapper(
|
| const char* filename, int line, const char* function_name) {
|
| GLenum error;
|
|
|