summaryrefslogtreecommitdiffstats
path: root/gpu/ipc
diff options
context:
space:
mode:
authorpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 23:37:14 +0000
committerpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 23:37:14 +0000
commitef16c174a500a841cf6a120dc4ef9fca89fac9f9 (patch)
tree8491a815c314e161a462f42c41c374403ce6ec8c /gpu/ipc
parentd0a7409f5ad0c075d5208ea0eb93ff07868c6168 (diff)
downloadchromium_src-ef16c174a500a841cf6a120dc4ef9fca89fac9f9.zip
chromium_src-ef16c174a500a841cf6a120dc4ef9fca89fac9f9.tar.gz
chromium_src-ef16c174a500a841cf6a120dc4ef9fca89fac9f9.tar.bz2
Rework FlushSync to return early if commands have been processed since the last update
BUG=80480 TEST= Review URL: http://codereview.chromium.org/6883179 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/ipc')
-rw-r--r--gpu/ipc/gpu_command_buffer_traits.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc
index eecf19f..66d4189 100644
--- a/gpu/ipc/gpu_command_buffer_traits.cc
+++ b/gpu/ipc/gpu_command_buffer_traits.cc
@@ -13,6 +13,7 @@ void ParamTraits<gpu::CommandBuffer::State> ::Write(Message* m,
WriteParam(m, p.put_offset);
WriteParam(m, p.token);
WriteParam(m, static_cast<int32>(p.error));
+ WriteParam(m, p.generation);
}
bool ParamTraits<gpu::CommandBuffer::State> ::Read(const Message* m,
@@ -23,7 +24,8 @@ bool ParamTraits<gpu::CommandBuffer::State> ::Read(const Message* m,
ReadParam(m, iter, &p->get_offset) &&
ReadParam(m, iter, &p->put_offset) &&
ReadParam(m, iter, &p->token) &&
- ReadParam(m, iter, &temp)) {
+ ReadParam(m, iter, &temp) &&
+ ReadParam(m, iter, &p->generation)) {
p->error = static_cast<gpu::error::Error>(temp);
return true;
} else {