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

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

Issue 11415223: gpu: Allow BufferData size=0 for pixel transfer buffer objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Allow BufferTracker::Buffer to be created with zero size. Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | gpu/command_buffer/client/buffer_tracker_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "../client/buffer_tracker.h" 5 #include "../client/buffer_tracker.h"
6 6
7 #include "../client/atomicops.h" 7 #include "../client/atomicops.h"
8 #include "../client/cmd_buffer_helper.h" 8 #include "../client/cmd_buffer_helper.h"
9 #include "../client/mapped_memory.h" 9 #include "../client/mapped_memory.h"
10 10
11 namespace gpu { 11 namespace gpu {
12 namespace gles2 { 12 namespace gles2 {
13 13
14 BufferTracker::BufferTracker(MappedMemoryManager* manager) 14 BufferTracker::BufferTracker(MappedMemoryManager* manager)
15 : mapped_memory_(manager) { 15 : mapped_memory_(manager) {
16 } 16 }
17 17
18 BufferTracker::~BufferTracker() { 18 BufferTracker::~BufferTracker() {
19 while (!buffers_.empty()) { 19 while (!buffers_.empty()) {
20 RemoveBuffer(buffers_.begin()->first); 20 RemoveBuffer(buffers_.begin()->first);
21 } 21 }
22 } 22 }
23 23
24 BufferTracker::Buffer* BufferTracker::CreateBuffer( 24 BufferTracker::Buffer* BufferTracker::CreateBuffer(
25 GLuint id, GLsizeiptr size) { 25 GLuint id, GLsizeiptr size) {
26 GPU_DCHECK_NE(0u, id); 26 GPU_DCHECK_NE(0u, id);
27 GPU_DCHECK_LT(0, size); 27 GPU_DCHECK_LE(0, size);
28 int32 shm_id; 28 int32 shm_id = -1;
29 uint32 shm_offset; 29 uint32 shm_offset = 0;
30 void* address = mapped_memory_->Alloc(size, &shm_id, &shm_offset); 30 void* address = NULL;
31 if (!address) { 31 if (size) {
32 return NULL; 32 address = mapped_memory_->Alloc(size, &shm_id, &shm_offset);
33 if (!address) {
34 return NULL;
35 }
33 } 36 }
34 37
35 Buffer* buffer = new Buffer(id, size, shm_id, shm_offset, address); 38 Buffer* buffer = new Buffer(id, size, shm_id, shm_offset, address);
36 std::pair<BufferMap::iterator, bool> result = 39 std::pair<BufferMap::iterator, bool> result =
37 buffers_.insert(std::make_pair(id, buffer)); 40 buffers_.insert(std::make_pair(id, buffer));
38 GPU_DCHECK(result.second); 41 GPU_DCHECK(result.second);
39 return buffer; 42 return buffer;
40 } 43 }
41 44
42 BufferTracker::Buffer* BufferTracker::GetBuffer(GLuint client_id) { 45 BufferTracker::Buffer* BufferTracker::GetBuffer(GLuint client_id) {
43 BufferMap::iterator it = buffers_.find(client_id); 46 BufferMap::iterator it = buffers_.find(client_id);
44 return it != buffers_.end() ? it->second : NULL; 47 return it != buffers_.end() ? it->second : NULL;
45 } 48 }
46 49
47 void BufferTracker::RemoveBuffer(GLuint client_id) { 50 void BufferTracker::RemoveBuffer(GLuint client_id) {
48 BufferMap::iterator it = buffers_.find(client_id); 51 BufferMap::iterator it = buffers_.find(client_id);
49 if (it != buffers_.end()) { 52 if (it != buffers_.end()) {
50 Buffer* buffer = it->second; 53 Buffer* buffer = it->second;
51 buffers_.erase(it); 54 buffers_.erase(it);
52 if (buffer->address_) 55 if (buffer->address_)
53 mapped_memory_->Free(buffer->address_); 56 mapped_memory_->Free(buffer->address_);
54 delete buffer; 57 delete buffer;
55 } 58 }
56 } 59 }
57 60
58 void BufferTracker::FreePendingToken(Buffer* buffer, int32 token) { 61 void BufferTracker::FreePendingToken(Buffer* buffer, int32 token) {
59 GPU_DCHECK(buffer->address_); 62 if (buffer->address_)
60 mapped_memory_->FreePendingToken(buffer->address_, token); 63 mapped_memory_->FreePendingToken(buffer->address_, token);
61 buffer->size_ = 0; 64 buffer->size_ = 0;
62 buffer->shm_id_ = 0; 65 buffer->shm_id_ = 0;
63 buffer->shm_offset_ = 0; 66 buffer->shm_offset_ = 0;
64 buffer->address_ = NULL; 67 buffer->address_ = NULL;
65 } 68 }
66 69
67 70
68 } // namespace gles2 71 } // namespace gles2
69 } // namespace gpu 72 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/client/buffer_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698