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

Unified Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 1796002: Changes the GLES2Implementation to use a RingBuffer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.h ('k') | gpu/command_buffer/client/ring_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/gles2_implementation.cc
===================================================================
--- gpu/command_buffer/client/gles2_implementation.cc (revision 45742)
+++ gpu/command_buffer/client/gles2_implementation.cc (working copy)
@@ -334,7 +334,11 @@
int32 transfer_buffer_id)
: util_(0), // TODO(gman): Get real number of compressed texture formats.
helper_(helper),
- transfer_buffer_(transfer_buffer_size, helper, transfer_buffer),
+ transfer_buffer_(
+ kStartingOffset,
+ transfer_buffer_size - kStartingOffset,
+ helper,
+ static_cast<char*>(transfer_buffer) + kStartingOffset),
transfer_buffer_id_(transfer_buffer_id),
pack_alignment_(4),
unpack_alignment_(4),
@@ -344,8 +348,8 @@
#endif
error_bits_(0) {
// Allocate space for simple GL results.
- result_buffer_ = transfer_buffer_.Alloc(kMaxSizeOfSimpleResult);
- result_shm_offset_ = transfer_buffer_.GetOffset(result_buffer_);
+ result_buffer_ = transfer_buffer;
+ result_shm_offset_ = 0;
#if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
GLint max_vertex_attribs;
@@ -366,7 +370,6 @@
GLES2Implementation::~GLES2Implementation() {
GLuint buffers[] = { kClientSideArrayId, kClientSideElementArrayId, };
DeleteBuffers(arraysize(buffers), &buffers[0]);
- transfer_buffer_.Free(result_buffer_);
}
void GLES2Implementation::MakeIds(
@@ -440,7 +443,7 @@
transfer_buffer_id_, transfer_buffer_.GetOffset(buffer));
WaitForCmd();
memcpy(&(*data)[offset], buffer, part_size);
- transfer_buffer_.Free(buffer);
+ transfer_buffer_.FreePendingToken(buffer, helper_->InsertToken());
offset += part_size;
size -= part_size;
}
@@ -1140,7 +1143,7 @@
dest += padded_row_size;
src += padded_row_size;
}
- transfer_buffer_.Free(buffer);
+ transfer_buffer_.FreePendingToken(buffer, helper_->InsertToken());
yoffset += num_rows;
height -= num_rows;
}
@@ -1170,7 +1173,7 @@
return;
}
memcpy(row_dest, buffer, part_size);
- transfer_buffer_.Free(buffer);
+ transfer_buffer_.FreePendingToken(buffer, helper_->InsertToken());
row_dest += part_size;
temp_xoffset += num_pixels;
temp_width -= num_pixels;
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.h ('k') | gpu/command_buffer/client/ring_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698