Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // This file is here so other GLES2 related files can have a common set of | 5 // This file is here so other GLES2 related files can have a common set of |
| 6 // includes where appropriate. | 6 // includes where appropriate. |
| 7 | 7 |
| 8 #include <sstream> | 8 #include <sstream> |
| 9 #include <GLES2/gl2.h> | 9 #include <GLES2/gl2.h> |
| 10 #include <GLES2/gl2ext.h> | 10 #include <GLES2/gl2ext.h> |
| 11 #include <GLES2/gl2extchromium.h> | 11 #include <GLES2/gl2extchromium.h> |
| 12 #include <GLES3/gl3.h> | 12 #include <GLES3/gl3.h> |
| 13 | 13 |
| 14 #include "base/numerics/safe_math.h" | 14 #include "base/numerics/safe_math.h" |
| 15 #include "gpu/command_buffer/common/gles2_cmd_format.h" | 15 //#include "gpu/command_buffer/common/gles2_cmd_format.h" |
|
kulakowski
2016/01/15 19:30:12
Any reason to leave it commented out rather than d
| |
| 16 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 16 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
| 17 | 17 |
| 18 namespace gpu { | 18 namespace gpu { |
| 19 namespace gles2 { | 19 namespace gles2 { |
| 20 | 20 |
| 21 namespace gl_error_bit { | 21 namespace gl_error_bit { |
| 22 enum GLErrorBit { | 22 enum GLErrorBit { |
| 23 kNoError = 0, | 23 kNoError = 0, |
| 24 kInvalidEnum = (1 << 0), | 24 kInvalidEnum = (1 << 0), |
| 25 kInvalidValue = (1 << 1), | 25 kInvalidValue = (1 << 1), |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1098 } | 1098 } |
| 1099 | 1099 |
| 1100 return true; | 1100 return true; |
| 1101 } | 1101 } |
| 1102 | 1102 |
| 1103 #include "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h" | 1103 #include "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h" |
| 1104 | 1104 |
| 1105 } // namespace gles2 | 1105 } // namespace gles2 |
| 1106 } // namespace gpu | 1106 } // namespace gpu |
| 1107 | 1107 |
| OLD | NEW |