OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 #ifndef CC_OUTPUT_PROGRAM_BINDING_H_ | 5 #ifndef CC_OUTPUT_PROGRAM_BINDING_H_ |
6 #define CC_OUTPUT_PROGRAM_BINDING_H_ | 6 #define CC_OUTPUT_PROGRAM_BINDING_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/macros.h" |
11 #include "cc/output/context_provider.h" | 12 #include "cc/output/context_provider.h" |
12 #include "cc/output/shader.h" | 13 #include "cc/output/shader.h" |
13 | 14 |
14 namespace gpu { | 15 namespace gpu { |
15 namespace gles2 { | 16 namespace gles2 { |
16 class GLES2Interface; | 17 class GLES2Interface; |
17 } | 18 } |
18 } | 19 } |
19 | 20 |
20 namespace cc { | 21 namespace cc { |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 private: | 117 private: |
117 VertexShader vertex_shader_; | 118 VertexShader vertex_shader_; |
118 FragmentShader fragment_shader_; | 119 FragmentShader fragment_shader_; |
119 | 120 |
120 DISALLOW_COPY_AND_ASSIGN(ProgramBinding); | 121 DISALLOW_COPY_AND_ASSIGN(ProgramBinding); |
121 }; | 122 }; |
122 | 123 |
123 } // namespace cc | 124 } // namespace cc |
124 | 125 |
125 #endif // CC_OUTPUT_PROGRAM_BINDING_H_ | 126 #endif // CC_OUTPUT_PROGRAM_BINDING_H_ |
OLD | NEW |