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 #ifndef GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_ | 5 #ifndef GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_ |
6 #define GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_ | 6 #define GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_ |
7 | 7 |
8 #include <GLES2/gl2.h> | 8 #include <GLES2/gl2.h> |
9 | 9 |
10 #include <queue> | 10 #include <queue> |
(...skipping 17 matching lines...) Expand all Loading... | |
28 unsigned int size, | 28 unsigned int size, |
29 int32 shm_id, | 29 int32 shm_id, |
30 uint32 shm_offset, | 30 uint32 shm_offset, |
31 void* address) | 31 void* address) |
32 : id_(id), | 32 : id_(id), |
33 size_(size), | 33 size_(size), |
34 shm_id_(shm_id), | 34 shm_id_(shm_id), |
35 shm_offset_(shm_offset), | 35 shm_offset_(shm_offset), |
36 address_(address), | 36 address_(address), |
37 mapped_(false), | 37 mapped_(false), |
38 transfer_ready_token_(0) { | 38 last_usage_token_(0), |
39 async_token_(0) { | |
epennerAtGoogle
2014/02/07 20:43:58
Naming nit: 'last_async_token'? I recall there wa
jadahl
2014/02/08 09:18:25
Before I called it "serial" and changed it to asyn
epennerAtGoogle
2014/02/10 23:12:06
Ahh I see. +1 to last_async_upload_token. No stron
| |
39 } | 40 } |
40 | 41 |
41 GLenum id() const { | 42 GLenum id() const { |
42 return id_; | 43 return id_; |
43 } | 44 } |
44 | 45 |
45 unsigned int size() const { | 46 unsigned int size() const { |
46 return size_; | 47 return size_; |
47 } | 48 } |
48 | 49 |
(...skipping 10 matching lines...) Expand all Loading... | |
59 } | 60 } |
60 | 61 |
61 void set_mapped(bool mapped) { | 62 void set_mapped(bool mapped) { |
62 mapped_ = mapped; | 63 mapped_ = mapped; |
63 } | 64 } |
64 | 65 |
65 bool mapped() const { | 66 bool mapped() const { |
66 return mapped_; | 67 return mapped_; |
67 } | 68 } |
68 | 69 |
69 void set_transfer_ready_token(int token) { | 70 void set_last_usage_token(int token) { |
70 transfer_ready_token_ = token; | 71 last_usage_token_ = token; |
71 } | 72 } |
72 | 73 |
73 uint32 transfer_ready_token() const { | 74 int last_usage_token() const { |
74 return transfer_ready_token_; | 75 return last_usage_token_; |
76 } | |
77 | |
78 void set_async_token(uint32 async_token) { | |
79 async_token_ = async_token; | |
80 } | |
81 | |
82 GLuint async_token() const { | |
83 return async_token_; | |
75 } | 84 } |
76 | 85 |
77 private: | 86 private: |
78 friend class BufferTracker; | 87 friend class BufferTracker; |
79 friend class BufferTrackerTest; | 88 friend class BufferTrackerTest; |
80 | 89 |
81 GLuint id_; | 90 GLuint id_; |
82 unsigned int size_; | 91 unsigned int size_; |
83 int32 shm_id_; | 92 int32 shm_id_; |
84 uint32 shm_offset_; | 93 uint32 shm_offset_; |
85 void* address_; | 94 void* address_; |
86 bool mapped_; | 95 bool mapped_; |
87 int32 transfer_ready_token_; | 96 int32 last_usage_token_; |
97 GLuint async_token_; | |
88 }; | 98 }; |
89 | 99 |
90 BufferTracker(MappedMemoryManager* manager); | 100 BufferTracker(MappedMemoryManager* manager); |
91 ~BufferTracker(); | 101 ~BufferTracker(); |
92 | 102 |
93 Buffer* CreateBuffer(GLuint id, GLsizeiptr size); | 103 Buffer* CreateBuffer(GLuint id, GLsizeiptr size); |
94 Buffer* GetBuffer(GLuint id); | 104 Buffer* GetBuffer(GLuint id); |
95 void RemoveBuffer(GLuint id); | 105 void RemoveBuffer(GLuint id); |
96 | 106 |
97 // Frees the block of memory associated with buffer, pending the passage | 107 // Frees the block of memory associated with buffer, pending the passage |
98 // of a token. | 108 // of a token. |
99 void FreePendingToken(Buffer*, int32 token); | 109 void FreePendingToken(Buffer* buffer, int32 token); |
110 void Unmanage(Buffer* buffer); | |
111 void Free(Buffer* buffer); | |
100 | 112 |
101 private: | 113 private: |
102 typedef base::hash_map<GLuint, Buffer*> BufferMap; | 114 typedef base::hash_map<GLuint, Buffer*> BufferMap; |
103 | 115 |
104 MappedMemoryManager* mapped_memory_; | 116 MappedMemoryManager* mapped_memory_; |
105 BufferMap buffers_; | 117 BufferMap buffers_; |
106 | 118 |
107 DISALLOW_COPY_AND_ASSIGN(BufferTracker); | 119 DISALLOW_COPY_AND_ASSIGN(BufferTracker); |
108 }; | 120 }; |
109 | 121 |
110 } // namespace gles2 | 122 } // namespace gles2 |
111 } // namespace gpu | 123 } // namespace gpu |
112 | 124 |
113 #endif // GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_ | 125 #endif // GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_ |
OLD | NEW |