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

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

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 #include "gpu/command_buffer/client/buffer_tracker.h" 5 #include "gpu/command_buffer/client/buffer_tracker.h"
6 6
7 #include "gpu/command_buffer/client/cmd_buffer_helper.h" 7 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
8 #include "gpu/command_buffer/client/mapped_memory.h" 8 #include "gpu/command_buffer/client/mapped_memory.h"
9 9
10 namespace gpu { 10 namespace gpu {
11 namespace gles2 { 11 namespace gles2 {
12 12
13 BufferTracker::BufferTracker(MappedMemoryManager* manager) 13 BufferTracker::BufferTracker(MappedMemoryManager* manager)
14 : mapped_memory_(manager) { 14 : mapped_memory_(manager) {
15 } 15 }
16 16
17 BufferTracker::~BufferTracker() { 17 BufferTracker::~BufferTracker() {
18 while (!buffers_.empty()) { 18 while (!buffers_.empty()) {
19 RemoveBuffer(buffers_.begin()->first); 19 RemoveBuffer(buffers_.begin()->first);
20 } 20 }
21 } 21 }
22 22
23 BufferTracker::Buffer* BufferTracker::CreateBuffer( 23 BufferTracker::Buffer* BufferTracker::CreateBuffer(
24 GLuint id, GLsizeiptr size) { 24 GLuint id, GLsizeiptr size, GLsizeiptr metadata_size) {
25 DCHECK_NE(0u, id); 25 DCHECK_NE(0u, id);
26 DCHECK_LE(0, size); 26 DCHECK_LE(0, size);
27 DCHECK_LE(0, metadata_size);
27 int32 shm_id = -1; 28 int32 shm_id = -1;
28 uint32 shm_offset = 0; 29 uint32 shm_offset = 0;
29 void* address = NULL; 30 void* address = NULL;
30 if (size) 31 const GLsizeiptr total_size = size + metadata_size;
31 address = mapped_memory_->Alloc(size, &shm_id, &shm_offset); 32 if (total_size)
33 address = mapped_memory_->Alloc(total_size, &shm_id, &shm_offset);
32 34
33 Buffer* buffer = new Buffer(id, size, shm_id, shm_offset, address); 35 Buffer* buffer =
36 new Buffer(id, size, shm_id, shm_offset, address, metadata_size);
34 std::pair<BufferMap::iterator, bool> result = 37 std::pair<BufferMap::iterator, bool> result =
35 buffers_.insert(std::make_pair(id, buffer)); 38 buffers_.insert(std::make_pair(id, buffer));
36 DCHECK(result.second); 39 DCHECK(result.second);
37 return buffer; 40 return buffer;
38 } 41 }
39 42
40 BufferTracker::Buffer* BufferTracker::GetBuffer(GLuint client_id) { 43 BufferTracker::Buffer* BufferTracker::GetBuffer(GLuint client_id) {
41 BufferMap::iterator it = buffers_.find(client_id); 44 BufferMap::iterator it = buffers_.find(client_id);
42 return it != buffers_.end() ? it->second : NULL; 45 return it != buffers_.end() ? it->second : NULL;
43 } 46 }
44 47
45 void BufferTracker::RemoveBuffer(GLuint client_id) { 48 void BufferTracker::RemoveBuffer(GLuint client_id) {
46 BufferMap::iterator it = buffers_.find(client_id); 49 BufferMap::iterator it = buffers_.find(client_id);
47 if (it != buffers_.end()) { 50 if (it != buffers_.end()) {
48 Buffer* buffer = it->second; 51 Buffer* buffer = it->second;
49 buffers_.erase(it); 52 buffers_.erase(it);
50 if (buffer->address_) 53 if (buffer->address_)
51 mapped_memory_->Free(buffer->address_); 54 mapped_memory_->Free(buffer->address_);
52 delete buffer; 55 delete buffer;
53 } 56 }
54 } 57 }
55 58
56 void BufferTracker::FreePendingToken(Buffer* buffer, int32 token) { 59 void BufferTracker::FreePendingToken(Buffer* buffer, int32 token) {
57 if (buffer->address_) 60 if (buffer->address_)
58 mapped_memory_->FreePendingToken(buffer->address_, token); 61 mapped_memory_->FreePendingToken(buffer->address_, token);
59 buffer->size_ = 0; 62 buffer->size_ = 0;
60 buffer->shm_id_ = 0; 63 buffer->shm_id_ = 0;
61 buffer->shm_offset_ = 0; 64 buffer->shm_offset_ = 0;
62 buffer->address_ = NULL; 65 buffer->address_ = NULL;
66 buffer->metadata_size_ = 0;
63 buffer->last_usage_token_ = 0; 67 buffer->last_usage_token_ = 0;
64 buffer->last_async_upload_token_ = 0; 68 buffer->last_async_upload_token_ = 0;
65 } 69 }
66 70
67 void BufferTracker::Unmanage(Buffer* buffer) { 71 void BufferTracker::Unmanage(Buffer* buffer) {
68 buffer->size_ = 0; 72 buffer->size_ = 0;
69 buffer->shm_id_ = 0; 73 buffer->shm_id_ = 0;
70 buffer->shm_offset_ = 0; 74 buffer->shm_offset_ = 0;
71 buffer->address_ = NULL; 75 buffer->address_ = NULL;
76 buffer->metadata_size_ = 0;
72 buffer->last_usage_token_ = 0; 77 buffer->last_usage_token_ = 0;
73 buffer->last_async_upload_token_ = 0; 78 buffer->last_async_upload_token_ = 0;
74 } 79 }
75 80
76 void BufferTracker::Free(Buffer* buffer) { 81 void BufferTracker::Free(Buffer* buffer) {
77 if (buffer->address_) 82 if (buffer->address_)
78 mapped_memory_->Free(buffer->address_); 83 mapped_memory_->Free(buffer->address_);
79 84
80 buffer->size_ = 0; 85 buffer->size_ = 0;
81 buffer->shm_id_ = 0; 86 buffer->shm_id_ = 0;
82 buffer->shm_offset_ = 0; 87 buffer->shm_offset_ = 0;
83 buffer->address_ = NULL; 88 buffer->address_ = NULL;
89 buffer->metadata_size_ = 0;
84 buffer->last_usage_token_ = 0; 90 buffer->last_usage_token_ = 0;
85 buffer->last_async_upload_token_ = 0; 91 buffer->last_async_upload_token_ = 0;
86 } 92 }
87 93
88 } // namespace gles2 94 } // namespace gles2
89 } // namespace gpu 95 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698