| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/command_buffer/service/error_state.h" | 5 #include "gpu/command_buffer/service/error_state.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
| 11 #include "gpu/command_buffer/service/logger.h" | 11 #include "gpu/command_buffer/service/logger.h" |
| 12 #include "ui/gl/gl_bindings.h" | 12 #include "ui/gl/gl_bindings.h" |
| 13 | 13 |
| 14 namespace gpu { | 14 namespace gpu { |
| 15 namespace gles2 { | 15 namespace gles2 { |
| 16 | 16 |
| 17 class ErrorStateImpl : public ErrorState { | 17 class ErrorStateImpl : public ErrorState { |
| 18 public: | 18 public: |
| 19 explicit ErrorStateImpl(ErrorStateClient* client, Logger* logger); | 19 explicit ErrorStateImpl(ErrorStateClient* client, Logger* logger); |
| 20 virtual ~ErrorStateImpl(); | 20 virtual ~ErrorStateImpl(); |
| 21 | 21 |
| 22 virtual uint32 GetGLError() OVERRIDE; | 22 virtual uint32 GetGLError() override; |
| 23 | 23 |
| 24 virtual void SetGLError( | 24 virtual void SetGLError( |
| 25 const char* filename, | 25 const char* filename, |
| 26 int line, | 26 int line, |
| 27 unsigned int error, | 27 unsigned int error, |
| 28 const char* function_name, | 28 const char* function_name, |
| 29 const char* msg) OVERRIDE; | 29 const char* msg) override; |
| 30 virtual void SetGLErrorInvalidEnum( | 30 virtual void SetGLErrorInvalidEnum( |
| 31 const char* filename, | 31 const char* filename, |
| 32 int line, | 32 int line, |
| 33 const char* function_name, | 33 const char* function_name, |
| 34 unsigned int value, | 34 unsigned int value, |
| 35 const char* label) OVERRIDE; | 35 const char* label) override; |
| 36 virtual void SetGLErrorInvalidParami( | 36 virtual void SetGLErrorInvalidParami( |
| 37 const char* filename, | 37 const char* filename, |
| 38 int line, | 38 int line, |
| 39 unsigned int error, | 39 unsigned int error, |
| 40 const char* function_name, | 40 const char* function_name, |
| 41 unsigned int pname, | 41 unsigned int pname, |
| 42 int param) OVERRIDE; | 42 int param) override; |
| 43 virtual void SetGLErrorInvalidParamf( | 43 virtual void SetGLErrorInvalidParamf( |
| 44 const char* filename, | 44 const char* filename, |
| 45 int line, | 45 int line, |
| 46 unsigned int error, | 46 unsigned int error, |
| 47 const char* function_name, | 47 const char* function_name, |
| 48 unsigned int pname, | 48 unsigned int pname, |
| 49 float param) OVERRIDE; | 49 float param) override; |
| 50 | 50 |
| 51 virtual unsigned int PeekGLError( | 51 virtual unsigned int PeekGLError( |
| 52 const char* filename, int line, const char* function_name) OVERRIDE; | 52 const char* filename, int line, const char* function_name) override; |
| 53 | 53 |
| 54 virtual void CopyRealGLErrorsToWrapper( | 54 virtual void CopyRealGLErrorsToWrapper( |
| 55 const char* filename, int line, const char* function_name) OVERRIDE; | 55 const char* filename, int line, const char* function_name) override; |
| 56 | 56 |
| 57 virtual void ClearRealGLErrors( | 57 virtual void ClearRealGLErrors( |
| 58 const char* filename, int line, const char* function_name) OVERRIDE; | 58 const char* filename, int line, const char* function_name) override; |
| 59 | 59 |
| 60 private: | 60 private: |
| 61 // The last error message set. | 61 // The last error message set. |
| 62 std::string last_error_; | 62 std::string last_error_; |
| 63 // Current GL error bits. | 63 // Current GL error bits. |
| 64 uint32 error_bits_; | 64 uint32 error_bits_; |
| 65 | 65 |
| 66 ErrorStateClient* client_; | 66 ErrorStateClient* client_; |
| 67 Logger* logger_; | 67 Logger* logger_; |
| 68 | 68 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 GLES2Util::GetStringEnum(error) + " : " + | 196 GLES2Util::GetStringEnum(error) + " : " + |
| 197 function_name + ": was unhandled"); | 197 function_name + ": was unhandled"); |
| 198 NOTREACHED() << "GL error " << error << " was unhandled."; | 198 NOTREACHED() << "GL error " << error << " was unhandled."; |
| 199 } | 199 } |
| 200 } | 200 } |
| 201 } | 201 } |
| 202 | 202 |
| 203 } // namespace gles2 | 203 } // namespace gles2 |
| 204 } // namespace gpu | 204 } // namespace gpu |
| 205 | 205 |
| OLD | NEW |