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 #include "gpu/command_buffer/service/vertex_array_manager.h" | 5 #include "gpu/command_buffer/service/vertex_array_manager.h" |
6 #include "base/debug/trace_event.h" | 6 #include "base/debug/trace_event.h" |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
9 #include "gpu/command_buffer/service/buffer_manager.h" | 9 #include "gpu/command_buffer/service/buffer_manager.h" |
10 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 10 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 new VertexAttribManager(this, service_id, num_vertex_attribs)); | 34 new VertexAttribManager(this, service_id, num_vertex_attribs)); |
35 std::pair<VertexAttribManagerMap::iterator, bool> result = | 35 std::pair<VertexAttribManagerMap::iterator, bool> result = |
36 vertex_attrib_managers_.insert( | 36 vertex_attrib_managers_.insert( |
37 std::make_pair(client_id, vertex_attrib_manager)); | 37 std::make_pair(client_id, vertex_attrib_manager)); |
38 DCHECK(result.second); | 38 DCHECK(result.second); |
39 } | 39 } |
40 | 40 |
41 VertexAttribManager* VertexArrayManager::GetVertexAttribManager( | 41 VertexAttribManager* VertexArrayManager::GetVertexAttribManager( |
42 GLuint client_id) { | 42 GLuint client_id) { |
43 VertexAttribManagerMap::iterator it = vertex_attrib_managers_.find(client_id); | 43 VertexAttribManagerMap::iterator it = vertex_attrib_managers_.find(client_id); |
44 return it != vertex_attrib_managers_.end() ? it->second : NULL; | 44 return it != vertex_attrib_managers_.end() ? it->second.get() : NULL; |
45 } | 45 } |
46 | 46 |
47 void VertexArrayManager::RemoveVertexAttribManager(GLuint client_id) { | 47 void VertexArrayManager::RemoveVertexAttribManager(GLuint client_id) { |
48 VertexAttribManagerMap::iterator it = vertex_attrib_managers_.find(client_id); | 48 VertexAttribManagerMap::iterator it = vertex_attrib_managers_.find(client_id); |
49 if (it != vertex_attrib_managers_.end()) { | 49 if (it != vertex_attrib_managers_.end()) { |
50 VertexAttribManager* vertex_attrib_manager = it->second.get(); | 50 VertexAttribManager* vertex_attrib_manager = it->second.get(); |
51 vertex_attrib_manager->MarkAsDeleted(); | 51 vertex_attrib_manager->MarkAsDeleted(); |
52 vertex_attrib_managers_.erase(it); | 52 vertex_attrib_managers_.erase(it); |
53 } | 53 } |
54 } | 54 } |
(...skipping 19 matching lines...) Expand all Loading... |
74 return true; | 74 return true; |
75 } | 75 } |
76 } | 76 } |
77 return false; | 77 return false; |
78 } | 78 } |
79 | 79 |
80 } // namespace gles2 | 80 } // namespace gles2 |
81 } // namespace gpu | 81 } // namespace gpu |
82 | 82 |
83 | 83 |
OLD | NEW |