Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: gpu/command_buffer/client/buffer_tracker.h

Issue 706173005: Enable asynchronous glReadPixels on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add mechanism to propagate service-side glMapBuffer errors + tests. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 10 matching lines...) Expand all
21 21
22 // Tracks buffer objects for client side of command buffer. 22 // Tracks buffer objects for client side of command buffer.
23 class GLES2_IMPL_EXPORT BufferTracker { 23 class GLES2_IMPL_EXPORT BufferTracker {
24 public: 24 public:
25 class GLES2_IMPL_EXPORT Buffer { 25 class GLES2_IMPL_EXPORT Buffer {
26 public: 26 public:
27 Buffer(GLuint id, 27 Buffer(GLuint id,
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 unsigned int metadata_size)
32 : id_(id), 33 : id_(id),
33 size_(size), 34 size_(size),
34 shm_id_(shm_id), 35 shm_id_(shm_id),
35 shm_offset_(shm_offset), 36 shm_offset_(shm_offset),
36 address_(address), 37 address_(address),
38 metadata_size_(metadata_size),
37 mapped_(false), 39 mapped_(false),
38 last_usage_token_(0), 40 last_usage_token_(0),
39 last_async_upload_token_(0) { 41 last_async_upload_token_(0) {
40 } 42 }
41 43
42 GLenum id() const { 44 GLenum id() const {
43 return id_; 45 return id_;
44 } 46 }
45 47
46 unsigned int size() const { 48 unsigned int size() const {
47 return size_; 49 return size_;
48 } 50 }
49 51
50 int32 shm_id() const { 52 int32 shm_id() const {
51 return shm_id_; 53 return shm_id_;
52 } 54 }
53 55
54 uint32 shm_offset() const { 56 uint32 shm_offset() const {
55 return shm_offset_; 57 return shm_offset_;
56 } 58 }
57 59
58 void* address() const { 60 void* address() const {
59 return address_; 61 return address_;
60 } 62 }
61 63
64 unsigned int metadata_size() const {
65 return metadata_size_;
66 }
67
68 int32 metadata_shm_id() const {
69 return shm_id_;
70 }
71
72 uint32 metadata_shm_offset() const {
73 return shm_offset_ + size_;
74 }
75
76 void* metadata_address() const {
77 return static_cast<uint8*>(address_) + size_;
78 }
79
62 void set_mapped(bool mapped) { 80 void set_mapped(bool mapped) {
63 mapped_ = mapped; 81 mapped_ = mapped;
64 } 82 }
65 83
66 bool mapped() const { 84 bool mapped() const {
67 return mapped_; 85 return mapped_;
68 } 86 }
69 87
70 void set_last_usage_token(int token) { 88 void set_last_usage_token(int token) {
71 last_usage_token_ = token; 89 last_usage_token_ = token;
(...skipping 13 matching lines...) Expand all
85 103
86 private: 104 private:
87 friend class BufferTracker; 105 friend class BufferTracker;
88 friend class BufferTrackerTest; 106 friend class BufferTrackerTest;
89 107
90 GLuint id_; 108 GLuint id_;
91 unsigned int size_; 109 unsigned int size_;
92 int32 shm_id_; 110 int32 shm_id_;
93 uint32 shm_offset_; 111 uint32 shm_offset_;
94 void* address_; 112 void* address_;
113 unsigned int metadata_size_;
95 bool mapped_; 114 bool mapped_;
96 int32 last_usage_token_; 115 int32 last_usage_token_;
97 GLuint last_async_upload_token_; 116 GLuint last_async_upload_token_;
98 }; 117 };
99 118
100 BufferTracker(MappedMemoryManager* manager); 119 BufferTracker(MappedMemoryManager* manager);
101 ~BufferTracker(); 120 ~BufferTracker();
102 121
103 Buffer* CreateBuffer(GLuint id, GLsizeiptr size); 122 Buffer* CreateBuffer(GLuint id, GLsizeiptr size, GLsizeiptr metadata_size);
104 Buffer* GetBuffer(GLuint id); 123 Buffer* GetBuffer(GLuint id);
105 void RemoveBuffer(GLuint id); 124 void RemoveBuffer(GLuint id);
106 125
107 // Frees the block of memory associated with buffer, pending the passage 126 // Frees the block of memory associated with buffer, pending the passage
108 // of a token. 127 // of a token.
109 void FreePendingToken(Buffer* buffer, int32 token); 128 void FreePendingToken(Buffer* buffer, int32 token);
110 void Unmanage(Buffer* buffer); 129 void Unmanage(Buffer* buffer);
111 void Free(Buffer* buffer); 130 void Free(Buffer* buffer);
112 131
113 private: 132 private:
114 typedef base::hash_map<GLuint, Buffer*> BufferMap; 133 typedef base::hash_map<GLuint, Buffer*> BufferMap;
115 134
116 MappedMemoryManager* mapped_memory_; 135 MappedMemoryManager* mapped_memory_;
117 BufferMap buffers_; 136 BufferMap buffers_;
118 137
119 DISALLOW_COPY_AND_ASSIGN(BufferTracker); 138 DISALLOW_COPY_AND_ASSIGN(BufferTracker);
120 }; 139 };
121 140
122 } // namespace gles2 141 } // namespace gles2
123 } // namespace gpu 142 } // namespace gpu
124 143
125 #endif // GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_ 144 #endif // GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/client/buffer_tracker.cc » ('j') | gpu/command_buffer/client/mapped_memory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698