| 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 contains the ContextState class. | 5 // This file contains the ContextState class. |
| 6 | 6 |
| 7 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ | 7 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ |
| 8 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ | 8 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 // Class that manages vertex attribs. | 142 // Class that manages vertex attribs. |
| 143 scoped_refptr<VertexAttribManager> vertex_attrib_manager; | 143 scoped_refptr<VertexAttribManager> vertex_attrib_manager; |
| 144 | 144 |
| 145 // The program in use by glUseProgram | 145 // The program in use by glUseProgram |
| 146 scoped_refptr<Program> current_program; | 146 scoped_refptr<Program> current_program; |
| 147 | 147 |
| 148 // The currently bound renderbuffer | 148 // The currently bound renderbuffer |
| 149 scoped_refptr<Renderbuffer> bound_renderbuffer; | 149 scoped_refptr<Renderbuffer> bound_renderbuffer; |
| 150 | 150 |
| 151 // A map of of target -> Query for current queries | 151 // A map of of target -> Query for current queries |
| 152 typedef std::map<GLuint, scoped_refptr<QueryManager::Query> > QueryMap; | 152 typedef std::pair<GLuint, bool> QueryKey; |
| 153 typedef std::map<QueryKey, scoped_refptr<QueryManager::Query> > QueryMap; |
| 153 QueryMap current_queries; | 154 QueryMap current_queries; |
| 154 | 155 |
| 155 bool pack_reverse_row_order; | 156 bool pack_reverse_row_order; |
| 156 | 157 |
| 157 mutable bool fbo_binding_for_scissor_workaround_dirty_; | 158 mutable bool fbo_binding_for_scissor_workaround_dirty_; |
| 158 FeatureInfo* feature_info_; | 159 FeatureInfo* feature_info_; |
| 159 | 160 |
| 160 private: | 161 private: |
| 161 scoped_ptr<ErrorState> error_state_; | 162 scoped_ptr<ErrorState> error_state_; |
| 162 }; | 163 }; |
| 163 | 164 |
| 164 } // namespace gles2 | 165 } // namespace gles2 |
| 165 } // namespace gpu | 166 } // namespace gpu |
| 166 | 167 |
| 167 #endif // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ | 168 #endif // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ |
| 168 | 169 |
| OLD | NEW |