Update from https://crrev.com/303153
This updates from chromium https://crrev.com/303153 aka
f9567f85788355bf3da8df030cbc232421d00b7d with the following additional
changes:
Update skia_build.patch and cc_strip_video.patch with trivial changes.
Update gpu::CommandBuffer state serialization for upstream changes.
Update ui/compositor/layer for upstream cc::SurfaceLayer changes.
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/706203003
diff --git a/gpu/command_buffer/client/client_test_helper.cc b/gpu/command_buffer/client/client_test_helper.cc
index 8c633ef..3c50f6b 100644
--- a/gpu/command_buffer/client/client_test_helper.cc
+++ b/gpu/command_buffer/client/client_test_helper.cc
@@ -15,7 +15,7 @@
namespace gpu {
-MockCommandBufferBase::MockCommandBufferBase() {
+MockCommandBufferBase::MockCommandBufferBase() : put_offset_(0) {
}
MockCommandBufferBase::~MockCommandBufferBase() {
@@ -40,7 +40,7 @@
void MockCommandBufferBase::WaitForTokenInRange(int32 start, int32 end) {}
void MockCommandBufferBase::WaitForGetOffsetInRange(int32 start, int32 end) {
- state_.get_offset = state_.put_offset;
+ state_.get_offset = put_offset_;
OnFlush();
}
@@ -48,7 +48,6 @@
ring_buffer_buffer_ = GetTransferBuffer(transfer_buffer_id);
ring_buffer_ =
static_cast<CommandBufferEntry*>(ring_buffer_buffer_->memory());
- state_.num_entries = ring_buffer_buffer_->size() / sizeof(ring_buffer_[0]);
state_.token = 10000; // All token checks in the tests should pass.
}
@@ -91,7 +90,7 @@
}
void MockCommandBufferBase::FlushHelper(int32 put_offset) {
- state_.put_offset = put_offset;
+ put_offset_ = put_offset;
}
void MockCommandBufferBase::SetToken(int32 token) {
@@ -110,6 +109,10 @@
state_.context_lost_reason = reason;
}
+int32 MockCommandBufferBase::GetPutOffset() {
+ return put_offset_;
+}
+
// GCC requires these declarations, but MSVC requires they not be present
#ifndef _MSC_VER
const int32 MockCommandBufferBase::kTransferBufferBaseId;
diff --git a/gpu/command_buffer/client/client_test_helper.h b/gpu/command_buffer/client/client_test_helper.h
index 2cf18e6..6778a83 100644
--- a/gpu/command_buffer/client/client_test_helper.h
+++ b/gpu/command_buffer/client/client_test_helper.h
@@ -41,6 +41,7 @@
void SetToken(int32 token) override;
void SetParseError(error::Error error) override;
void SetContextLostReason(error::ContextLostReason reason) override;
+ int32 GetPutOffset() override;
// Get's the Id of the next transfer buffer that will be returned
// by CreateTransferBuffer. This is useful for testing expected ids.
@@ -56,6 +57,7 @@
CommandBufferEntry* ring_buffer_;
scoped_refptr<Buffer> ring_buffer_buffer_;
State state_;
+ int32 put_offset_;
};
class MockClientCommandBuffer : public MockCommandBufferBase {
diff --git a/gpu/command_buffer/client/cmd_buffer_helper_test.cc b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
index 3ff9d3a..fe68887 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper_test.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
@@ -241,7 +241,7 @@
}
int32 GetPutOffset() {
- return command_buffer_->GetLastState().put_offset;
+ return command_buffer_->GetPutOffset();
}
int32 GetHelperGetOffset() { return helper_->get_offset(); }
diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
index 392bb22..56f1880 100644
--- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
@@ -124,8 +124,8 @@
GLsizei width,
GLsizei height,
GLint border) {
- gles2::GetGLContext()->CopyTexImage2D(
- target, level, internalformat, x, y, width, height, border);
+ gles2::GetGLContext()->CopyTexImage2D(target, level, internalformat, x, y,
+ width, height, border);
}
void GLES2CopyTexSubImage2D(GLenum target,
GLint level,
@@ -135,8 +135,8 @@
GLint y,
GLsizei width,
GLsizei height) {
- gles2::GetGLContext()->CopyTexSubImage2D(
- target, level, xoffset, yoffset, x, y, width, height);
+ gles2::GetGLContext()->CopyTexSubImage2D(target, level, xoffset, yoffset, x,
+ y, width, height);
}
GLuint GLES2CreateProgram() {
return gles2::GetGLContext()->CreateProgram();
@@ -216,8 +216,8 @@
GLenum textarget,
GLuint texture,
GLint level) {
- gles2::GetGLContext()->FramebufferTexture2D(
- target, attachment, textarget, texture, level);
+ gles2::GetGLContext()->FramebufferTexture2D(target, attachment, textarget,
+ texture, level);
}
void GLES2FrontFace(GLenum mode) {
gles2::GetGLContext()->FrontFace(mode);
@@ -244,8 +244,8 @@
GLint* size,
GLenum* type,
char* name) {
- gles2::GetGLContext()->GetActiveAttrib(
- program, index, bufsize, length, size, type, name);
+ gles2::GetGLContext()->GetActiveAttrib(program, index, bufsize, length, size,
+ type, name);
}
void GLES2GetActiveUniform(GLuint program,
GLuint index,
@@ -254,8 +254,8 @@
GLint* size,
GLenum* type,
char* name) {
- gles2::GetGLContext()->GetActiveUniform(
- program, index, bufsize, length, size, type, name);
+ gles2::GetGLContext()->GetActiveUniform(program, index, bufsize, length, size,
+ type, name);
}
void GLES2GetAttachedShaders(GLuint program,
GLsizei maxcount,
@@ -282,8 +282,8 @@
GLenum attachment,
GLenum pname,
GLint* params) {
- gles2::GetGLContext()->GetFramebufferAttachmentParameteriv(
- target, attachment, pname, params);
+ gles2::GetGLContext()->GetFramebufferAttachmentParameteriv(target, attachment,
+ pname, params);
}
void GLES2GetIntegerv(GLenum pname, GLint* params) {
gles2::GetGLContext()->GetIntegerv(pname, params);
@@ -315,8 +315,8 @@
GLenum precisiontype,
GLint* range,
GLint* precision) {
- gles2::GetGLContext()->GetShaderPrecisionFormat(
- shadertype, precisiontype, range, precision);
+ gles2::GetGLContext()->GetShaderPrecisionFormat(shadertype, precisiontype,
+ range, precision);
}
void GLES2GetShaderSource(GLuint shader,
GLsizei bufsize,
@@ -403,8 +403,8 @@
GLenum internalformat,
GLsizei width,
GLsizei height) {
- gles2::GetGLContext()->RenderbufferStorage(
- target, internalformat, width, height);
+ gles2::GetGLContext()->RenderbufferStorage(target, internalformat, width,
+ height);
}
void GLES2SampleCoverage(GLclampf value, GLboolean invert) {
gles2::GetGLContext()->SampleCoverage(value, invert);
@@ -464,15 +464,8 @@
GLenum format,
GLenum type,
const void* pixels) {
- gles2::GetGLContext()->TexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- pixels);
+ gles2::GetGLContext()->TexImage2D(target, level, internalformat, width,
+ height, border, format, type, pixels);
}
void GLES2TexParameterf(GLenum target, GLenum pname, GLfloat param) {
gles2::GetGLContext()->TexParameterf(target, pname, param);
@@ -495,8 +488,8 @@
GLenum format,
GLenum type,
const void* pixels) {
- gles2::GetGLContext()->TexSubImage2D(
- target, level, xoffset, yoffset, width, height, format, type, pixels);
+ gles2::GetGLContext()->TexSubImage2D(target, level, xoffset, yoffset, width,
+ height, format, type, pixels);
}
void GLES2Uniform1f(GLint location, GLfloat x) {
gles2::GetGLContext()->Uniform1f(location, x);
@@ -608,8 +601,8 @@
GLboolean normalized,
GLsizei stride,
const void* ptr) {
- gles2::GetGLContext()->VertexAttribPointer(
- indx, size, type, normalized, stride, ptr);
+ gles2::GetGLContext()->VertexAttribPointer(indx, size, type, normalized,
+ stride, ptr);
}
void GLES2Viewport(GLint x, GLint y, GLsizei width, GLsizei height) {
gles2::GetGLContext()->Viewport(x, y, width, height);
@@ -657,8 +650,8 @@
GLenum internalFormat,
GLsizei width,
GLsizei height) {
- gles2::GetGLContext()->TexStorage2DEXT(
- target, levels, internalFormat, width, height);
+ gles2::GetGLContext()->TexStorage2DEXT(target, levels, internalFormat, width,
+ height);
}
void GLES2GenQueriesEXT(GLsizei n, GLuint* queries) {
gles2::GetGLContext()->GenQueriesEXT(n, queries);
@@ -709,8 +702,8 @@
GLsizei count,
GLenum type,
GLuint offset) {
- return gles2::GetGLContext()->GetMaxValueInBufferCHROMIUM(
- buffer_id, count, type, offset);
+ return gles2::GetGLContext()->GetMaxValueInBufferCHROMIUM(buffer_id, count,
+ type, offset);
}
GLboolean GLES2EnableFeatureCHROMIUM(const char* feature) {
return gles2::GetGLContext()->EnableFeatureCHROMIUM(feature);
@@ -725,8 +718,8 @@
GLintptr offset,
GLsizeiptr size,
GLenum access) {
- return gles2::GetGLContext()->MapBufferSubDataCHROMIUM(
- target, offset, size, access);
+ return gles2::GetGLContext()->MapBufferSubDataCHROMIUM(target, offset, size,
+ access);
}
void GLES2UnmapBufferSubDataCHROMIUM(const void* mem) {
gles2::GetGLContext()->UnmapBufferSubDataCHROMIUM(mem);
@@ -762,8 +755,8 @@
GLuint count,
GLint* results,
GLsizeiptr size) {
- gles2::GetGLContext()->GetMultipleIntegervCHROMIUM(
- pnames, count, results, size);
+ gles2::GetGLContext()->GetMultipleIntegervCHROMIUM(pnames, count, results,
+ size);
}
void GLES2GetProgramInfoCHROMIUM(GLuint program,
GLsizei bufsize,
@@ -778,8 +771,8 @@
GLsizei width,
GLsizei height,
GLenum internalformat) {
- return gles2::GetGLContext()->CreateImageCHROMIUM(
- buffer, width, height, internalformat);
+ return gles2::GetGLContext()->CreateImageCHROMIUM(buffer, width, height,
+ internalformat);
}
void GLES2DestroyImageCHROMIUM(GLuint image_id) {
gles2::GetGLContext()->DestroyImageCHROMIUM(image_id);
@@ -795,8 +788,8 @@
GLsizei bufsize,
GLsizei* length,
char* source) {
- gles2::GetGLContext()->GetTranslatedShaderSourceANGLE(
- shader, bufsize, length, source);
+ gles2::GetGLContext()->GetTranslatedShaderSourceANGLE(shader, bufsize, length,
+ source);
}
void GLES2PostSubBufferCHROMIUM(GLint x, GLint y, GLint width, GLint height) {
gles2::GetGLContext()->PostSubBufferCHROMIUM(x, y, width, height);
@@ -806,8 +799,8 @@
GLsizei height,
GLuint ioSurfaceId,
GLuint plane) {
- gles2::GetGLContext()->TexImageIOSurface2DCHROMIUM(
- target, width, height, ioSurfaceId, plane);
+ gles2::GetGLContext()->TexImageIOSurface2DCHROMIUM(target, width, height,
+ ioSurfaceId, plane);
}
void GLES2CopyTextureCHROMIUM(GLenum target,
GLenum source_id,
@@ -815,23 +808,23 @@
GLint level,
GLint internalformat,
GLenum dest_type) {
- gles2::GetGLContext()->CopyTextureCHROMIUM(
- target, source_id, dest_id, level, internalformat, dest_type);
+ gles2::GetGLContext()->CopyTextureCHROMIUM(target, source_id, dest_id, level,
+ internalformat, dest_type);
}
void GLES2DrawArraysInstancedANGLE(GLenum mode,
GLint first,
GLsizei count,
GLsizei primcount) {
- gles2::GetGLContext()->DrawArraysInstancedANGLE(
- mode, first, count, primcount);
+ gles2::GetGLContext()->DrawArraysInstancedANGLE(mode, first, count,
+ primcount);
}
void GLES2DrawElementsInstancedANGLE(GLenum mode,
GLsizei count,
GLenum type,
const void* indices,
GLsizei primcount) {
- gles2::GetGLContext()->DrawElementsInstancedANGLE(
- mode, count, type, indices, primcount);
+ gles2::GetGLContext()->DrawElementsInstancedANGLE(mode, count, type, indices,
+ primcount);
}
void GLES2VertexAttribDivisorANGLE(GLuint index, GLuint divisor) {
gles2::GetGLContext()->VertexAttribDivisorANGLE(index, divisor);
@@ -893,15 +886,9 @@
GLenum format,
GLenum type,
const void* pixels) {
- gles2::GetGLContext()->AsyncTexImage2DCHROMIUM(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- pixels);
+ gles2::GetGLContext()->AsyncTexImage2DCHROMIUM(target, level, internalformat,
+ width, height, border, format,
+ type, pixels);
}
void GLES2WaitAsyncTexImage2DCHROMIUM(GLenum target) {
gles2::GetGLContext()->WaitAsyncTexImage2DCHROMIUM(target);
@@ -940,17 +927,9 @@
GLfloat uv_y,
GLfloat uv_width,
GLfloat uv_height) {
- gles2::GetGLContext()->ScheduleOverlayPlaneCHROMIUM(plane_z_order,
- plane_transform,
- overlay_texture_id,
- bounds_x,
- bounds_y,
- bounds_width,
- bounds_height,
- uv_x,
- uv_y,
- uv_width,
- uv_height);
+ gles2::GetGLContext()->ScheduleOverlayPlaneCHROMIUM(
+ plane_z_order, plane_transform, overlay_texture_id, bounds_x, bounds_y,
+ bounds_width, bounds_height, uv_x, uv_y, uv_width, uv_height);
}
void GLES2MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) {
gles2::GetGLContext()->MatrixLoadfCHROMIUM(matrixMode, m);
diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
index 24d8be2..9aeb449 100644
--- a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
+++ b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
@@ -205,14 +205,8 @@
gles2::cmds::CompressedTexImage2D* c =
GetCmdSpace<gles2::cmds::CompressedTexImage2D>();
if (c) {
- c->Init(target,
- level,
- internalformat,
- width,
- height,
- imageSize,
- data_shm_id,
- data_shm_offset);
+ c->Init(target, level, internalformat, width, height, imageSize,
+ data_shm_id, data_shm_offset);
}
}
@@ -244,16 +238,8 @@
gles2::cmds::CompressedTexSubImage2D* c =
GetCmdSpace<gles2::cmds::CompressedTexSubImage2D>();
if (c) {
- c->Init(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- imageSize,
- data_shm_id,
- data_shm_offset);
+ c->Init(target, level, xoffset, yoffset, width, height, format, imageSize,
+ data_shm_id, data_shm_offset);
}
}
@@ -892,17 +878,8 @@
GLboolean async) {
gles2::cmds::ReadPixels* c = GetCmdSpace<gles2::cmds::ReadPixels>();
if (c) {
- c->Init(x,
- y,
- width,
- height,
- format,
- type,
- pixels_shm_id,
- pixels_shm_offset,
- result_shm_id,
- result_shm_offset,
- async);
+ c->Init(x, y, width, height, format, type, pixels_shm_id, pixels_shm_offset,
+ result_shm_id, result_shm_offset, async);
}
}
@@ -948,13 +925,8 @@
GLsizei length) {
gles2::cmds::ShaderBinary* c = GetCmdSpace<gles2::cmds::ShaderBinary>();
if (c) {
- c->Init(n,
- shaders_shm_id,
- shaders_shm_offset,
- binaryformat,
- binary_shm_id,
- binary_shm_offset,
- length);
+ c->Init(n, shaders_shm_id, shaders_shm_offset, binaryformat, binary_shm_id,
+ binary_shm_offset, length);
}
}
@@ -1022,15 +994,8 @@
uint32_t pixels_shm_offset) {
gles2::cmds::TexImage2D* c = GetCmdSpace<gles2::cmds::TexImage2D>();
if (c) {
- c->Init(target,
- level,
- internalformat,
- width,
- height,
- format,
- type,
- pixels_shm_id,
- pixels_shm_offset);
+ c->Init(target, level, internalformat, width, height, format, type,
+ pixels_shm_id, pixels_shm_offset);
}
}
@@ -1081,17 +1046,8 @@
GLboolean internal) {
gles2::cmds::TexSubImage2D* c = GetCmdSpace<gles2::cmds::TexSubImage2D>();
if (c) {
- c->Init(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- type,
- pixels_shm_id,
- pixels_shm_offset,
- internal);
+ c->Init(target, level, xoffset, yoffset, width, height, format, type,
+ pixels_shm_id, pixels_shm_offset, internal);
}
}
@@ -1377,8 +1333,8 @@
gles2::cmds::BlitFramebufferCHROMIUM* c =
GetCmdSpace<gles2::cmds::BlitFramebufferCHROMIUM>();
if (c) {
- c->Init(
- srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+ c->Init(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
+ filter);
}
}
@@ -1591,12 +1547,8 @@
gles2::cmds::GetMultipleIntegervCHROMIUM* c =
GetCmdSpace<gles2::cmds::GetMultipleIntegervCHROMIUM>();
if (c) {
- c->Init(pnames_shm_id,
- pnames_shm_offset,
- count,
- results_shm_id,
- results_shm_offset,
- size);
+ c->Init(pnames_shm_id, pnames_shm_offset, count, results_shm_id,
+ results_shm_offset, size);
}
}
@@ -1773,18 +1725,8 @@
gles2::cmds::AsyncTexSubImage2DCHROMIUM* c =
GetCmdSpace<gles2::cmds::AsyncTexSubImage2DCHROMIUM>();
if (c) {
- c->Init(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- type,
- data_shm_id,
- data_shm_offset,
- async_upload_token,
- sync_data_shm_id,
+ c->Init(target, level, xoffset, yoffset, width, height, format, type,
+ data_shm_id, data_shm_offset, async_upload_token, sync_data_shm_id,
sync_data_shm_offset);
}
}
@@ -1804,18 +1746,9 @@
gles2::cmds::AsyncTexImage2DCHROMIUM* c =
GetCmdSpace<gles2::cmds::AsyncTexImage2DCHROMIUM>();
if (c) {
- c->Init(target,
- level,
- internalformat,
- width,
- height,
- format,
- type,
- pixels_shm_id,
- pixels_shm_offset,
- async_upload_token,
- sync_data_shm_id,
- sync_data_shm_offset);
+ c->Init(target, level, internalformat, width, height, format, type,
+ pixels_shm_id, pixels_shm_offset, async_upload_token,
+ sync_data_shm_id, sync_data_shm_offset);
}
}
@@ -1896,16 +1829,8 @@
gles2::cmds::ScheduleOverlayPlaneCHROMIUM* c =
GetCmdSpace<gles2::cmds::ScheduleOverlayPlaneCHROMIUM>();
if (c) {
- c->Init(plane_z_order,
- plane_transform,
- overlay_texture_id,
- bounds_x,
- bounds_y,
- bounds_width,
- bounds_height,
- uv_x,
- uv_y,
- uv_width,
+ c->Init(plane_z_order, plane_transform, overlay_texture_id, bounds_x,
+ bounds_y, bounds_width, bounds_height, uv_x, uv_y, uv_width,
uv_height);
}
}
diff --git a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
index 32b1347..e7cc074 100644
--- a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
@@ -42,8 +42,8 @@
<< GLES2Util::GetStringFrameBufferTarget(target) << ", "
<< framebuffer << ")");
if (IsFramebufferReservedId(framebuffer)) {
- SetGLError(
- GL_INVALID_OPERATION, "BindFramebuffer", "framebuffer reserved id");
+ SetGLError(GL_INVALID_OPERATION, "BindFramebuffer",
+ "framebuffer reserved id");
return;
}
if (BindFramebufferHelper(target, framebuffer)) {
@@ -58,8 +58,8 @@
<< GLES2Util::GetStringRenderBufferTarget(target) << ", "
<< renderbuffer << ")");
if (IsRenderbufferReservedId(renderbuffer)) {
- SetGLError(
- GL_INVALID_OPERATION, "BindRenderbuffer", "renderbuffer reserved id");
+ SetGLError(GL_INVALID_OPERATION, "BindRenderbuffer",
+ "renderbuffer reserved id");
return;
}
if (BindRenderbufferHelper(target, renderbuffer)) {
@@ -146,8 +146,8 @@
return GL_FRAMEBUFFER_UNSUPPORTED;
}
*result = 0;
- helper_->CheckFramebufferStatus(
- target, GetResultShmId(), GetResultShmOffset());
+ helper_->CheckFramebufferStatus(target, GetResultShmId(),
+ GetResultShmOffset());
WaitForCmd();
GLenum result_value = *result;
GPU_CLIENT_LOG("returned " << result_value);
@@ -261,8 +261,8 @@
SetGLError(GL_INVALID_VALUE, "glCopyTexSubImage2D", "height < 0");
return;
}
- helper_->CopyTexSubImage2D(
- target, level, xoffset, yoffset, x, y, width, height);
+ helper_->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width,
+ height);
CheckGLError();
}
@@ -449,8 +449,8 @@
<< GLES2Util::GetStringAttachment(attachment) << ", "
<< GLES2Util::GetStringRenderBufferTarget(
renderbuffertarget) << ", " << renderbuffer << ")");
- helper_->FramebufferRenderbuffer(
- target, attachment, renderbuffertarget, renderbuffer);
+ helper_->FramebufferRenderbuffer(target, attachment, renderbuffertarget,
+ renderbuffer);
CheckGLError();
}
@@ -466,8 +466,8 @@
<< GLES2Util::GetStringTextureTarget(textarget) << ", "
<< texture << ", " << level << ")");
if (level != 0) {
- SetGLError(
- GL_INVALID_VALUE, "glFramebufferTexture2D", "level GL_INVALID_VALUE");
+ SetGLError(GL_INVALID_VALUE, "glFramebufferTexture2D",
+ "level GL_INVALID_VALUE");
return;
}
helper_->FramebufferTexture2D(target, attachment, textarget, texture);
@@ -620,8 +620,8 @@
return;
}
result->SetNumResults(0);
- helper_->GetBufferParameteriv(
- target, pname, GetResultShmId(), GetResultShmOffset());
+ helper_->GetBufferParameteriv(target, pname, GetResultShmId(),
+ GetResultShmOffset());
WaitForCmd();
result->CopyResult(params);
GPU_CLIENT_LOG_CODE_BLOCK({
@@ -670,8 +670,8 @@
<< static_cast<const void*>(params) << ")");
TRACE_EVENT0("gpu",
"GLES2Implementation::GetFramebufferAttachmentParameteriv");
- if (GetFramebufferAttachmentParameterivHelper(
- target, attachment, pname, params)) {
+ if (GetFramebufferAttachmentParameterivHelper(target, attachment, pname,
+ params)) {
return;
}
typedef cmds::GetFramebufferAttachmentParameteriv::Result Result;
@@ -791,8 +791,8 @@
return;
}
result->SetNumResults(0);
- helper_->GetRenderbufferParameteriv(
- target, pname, GetResultShmId(), GetResultShmOffset());
+ helper_->GetRenderbufferParameteriv(target, pname, GetResultShmId(),
+ GetResultShmOffset());
WaitForCmd();
result->CopyResult(params);
GPU_CLIENT_LOG_CODE_BLOCK({
@@ -902,8 +902,8 @@
return;
}
result->SetNumResults(0);
- helper_->GetTexParameterfv(
- target, pname, GetResultShmId(), GetResultShmOffset());
+ helper_->GetTexParameterfv(target, pname, GetResultShmId(),
+ GetResultShmOffset());
WaitForCmd();
result->CopyResult(params);
GPU_CLIENT_LOG_CODE_BLOCK({
@@ -932,8 +932,8 @@
return;
}
result->SetNumResults(0);
- helper_->GetTexParameteriv(
- target, pname, GetResultShmId(), GetResultShmOffset());
+ helper_->GetTexParameteriv(target, pname, GetResultShmId(),
+ GetResultShmOffset());
WaitForCmd();
result->CopyResult(params);
GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1497,8 +1497,8 @@
return;
}
if (transpose != false) {
- SetGLError(
- GL_INVALID_VALUE, "glUniformMatrix2fv", "transpose GL_INVALID_VALUE");
+ SetGLError(GL_INVALID_VALUE, "glUniformMatrix2fv",
+ "transpose GL_INVALID_VALUE");
return;
}
helper_->UniformMatrix2fvImmediate(location, count, value);
@@ -1529,8 +1529,8 @@
return;
}
if (transpose != false) {
- SetGLError(
- GL_INVALID_VALUE, "glUniformMatrix3fv", "transpose GL_INVALID_VALUE");
+ SetGLError(GL_INVALID_VALUE, "glUniformMatrix3fv",
+ "transpose GL_INVALID_VALUE");
return;
}
helper_->UniformMatrix3fvImmediate(location, count, value);
@@ -1564,8 +1564,8 @@
return;
}
if (transpose != false) {
- SetGLError(
- GL_INVALID_VALUE, "glUniformMatrix4fv", "transpose GL_INVALID_VALUE");
+ SetGLError(GL_INVALID_VALUE, "glUniformMatrix4fv",
+ "transpose GL_INVALID_VALUE");
return;
}
helper_->UniformMatrix4fvImmediate(location, count, value);
@@ -1705,8 +1705,8 @@
<< ", " << dstX0 << ", " << dstY0 << ", " << dstX1 << ", "
<< dstY1 << ", " << mask << ", "
<< GLES2Util::GetStringBlitFilter(filter) << ")");
- helper_->BlitFramebufferCHROMIUM(
- srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+ helper_->BlitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0,
+ dstX1, dstY1, mask, filter);
CheckGLError();
}
@@ -1723,20 +1723,17 @@
<< ", " << GLES2Util::GetStringRenderBufferFormat(internalformat)
<< ", " << width << ", " << height << ")");
if (samples < 0) {
- SetGLError(GL_INVALID_VALUE,
- "glRenderbufferStorageMultisampleCHROMIUM",
+ SetGLError(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleCHROMIUM",
"samples < 0");
return;
}
if (width < 0) {
- SetGLError(GL_INVALID_VALUE,
- "glRenderbufferStorageMultisampleCHROMIUM",
+ SetGLError(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleCHROMIUM",
"width < 0");
return;
}
if (height < 0) {
- SetGLError(GL_INVALID_VALUE,
- "glRenderbufferStorageMultisampleCHROMIUM",
+ SetGLError(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleCHROMIUM",
"height < 0");
return;
}
@@ -1758,22 +1755,22 @@
<< ", " << GLES2Util::GetStringRenderBufferFormat(internalformat)
<< ", " << width << ", " << height << ")");
if (samples < 0) {
- SetGLError(
- GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT", "samples < 0");
+ SetGLError(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT",
+ "samples < 0");
return;
}
if (width < 0) {
- SetGLError(
- GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT", "width < 0");
+ SetGLError(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT",
+ "width < 0");
return;
}
if (height < 0) {
- SetGLError(
- GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT", "height < 0");
+ SetGLError(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT",
+ "height < 0");
return;
}
- helper_->RenderbufferStorageMultisampleEXT(
- target, samples, internalformat, width, height);
+ helper_->RenderbufferStorageMultisampleEXT(target, samples, internalformat,
+ width, height);
CheckGLError();
}
@@ -1791,19 +1788,17 @@
<< GLES2Util::GetStringTextureTarget(textarget) << ", "
<< texture << ", " << level << ", " << samples << ")");
if (level != 0) {
- SetGLError(GL_INVALID_VALUE,
- "glFramebufferTexture2DMultisampleEXT",
+ SetGLError(GL_INVALID_VALUE, "glFramebufferTexture2DMultisampleEXT",
"level GL_INVALID_VALUE");
return;
}
if (samples < 0) {
- SetGLError(GL_INVALID_VALUE,
- "glFramebufferTexture2DMultisampleEXT",
+ SetGLError(GL_INVALID_VALUE, "glFramebufferTexture2DMultisampleEXT",
"samples < 0");
return;
}
- helper_->FramebufferTexture2DMultisampleEXT(
- target, attachment, textarget, texture, samples);
+ helper_->FramebufferTexture2DMultisampleEXT(target, attachment, textarget,
+ texture, samples);
CheckGLError();
}
@@ -2001,8 +1996,8 @@
SetGLError(GL_INVALID_VALUE, "glTexImageIOSurface2DCHROMIUM", "height < 0");
return;
}
- helper_->TexImageIOSurface2DCHROMIUM(
- target, width, height, ioSurfaceId, plane);
+ helper_->TexImageIOSurface2DCHROMIUM(target, width, height, ioSurfaceId,
+ plane);
CheckGLError();
}
@@ -2019,8 +2014,8 @@
<< GLES2Util::GetStringEnum(dest_id) << ", " << level
<< ", " << internalformat << ", "
<< GLES2Util::GetStringPixelType(dest_type) << ")");
- helper_->CopyTextureCHROMIUM(
- target, source_id, dest_id, level, internalformat, dest_type);
+ helper_->CopyTextureCHROMIUM(target, source_id, dest_id, level,
+ internalformat, dest_type);
CheckGLError();
}
@@ -2124,17 +2119,9 @@
<< ", " << overlay_texture_id << ", " << bounds_x << ", " << bounds_y
<< ", " << bounds_width << ", " << bounds_height << ", " << uv_x
<< ", " << uv_y << ", " << uv_width << ", " << uv_height << ")");
- helper_->ScheduleOverlayPlaneCHROMIUM(plane_z_order,
- plane_transform,
- overlay_texture_id,
- bounds_x,
- bounds_y,
- bounds_width,
- bounds_height,
- uv_x,
- uv_y,
- uv_width,
- uv_height);
+ helper_->ScheduleOverlayPlaneCHROMIUM(
+ plane_z_order, plane_transform, overlay_texture_id, bounds_x, bounds_y,
+ bounds_width, bounds_height, uv_x, uv_y, uv_width, uv_height);
CheckGLError();
}
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index 3d2f089..be1f1a3 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -467,7 +467,7 @@
scoped_refptr<Buffer> ring_buffer = helper_->get_ring_buffer();
commands_ = static_cast<CommandBufferEntry*>(ring_buffer->memory()) +
- command_buffer()->GetLastState().put_offset;
+ command_buffer()->GetPutOffset();
ClearCommands();
EXPECT_TRUE(transfer_buffer_->InSync());
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
index a42d6d5..8069b12 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
@@ -421,8 +421,8 @@
Cmds expected;
expected.cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, 4);
- gl_->FramebufferRenderbuffer(
- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, 4);
+ gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_RENDERBUFFER, 4);
EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
}
@@ -433,14 +433,14 @@
Cmds expected;
expected.cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4);
- gl_->FramebufferTexture2D(
- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 0);
+ gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+ 4, 0);
EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
}
TEST_F(GLES2ImplementationTest, FramebufferTexture2DInvalidConstantArg4) {
- gl_->FramebufferTexture2D(
- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 1);
+ gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+ 4, 1);
EXPECT_TRUE(NoCommandsWritten());
EXPECT_EQ(GL_INVALID_VALUE, CheckError());
}
@@ -602,18 +602,14 @@
Result::Type result = 0;
Cmds expected;
ExpectedMemoryInfo result1 = GetExpectedResultMemory(4);
- expected.cmd.Init(123,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
- result1.id,
+ expected.cmd.Init(123, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, result1.id,
result1.offset);
EXPECT_CALL(*command_buffer(), OnFlush())
.WillOnce(SetMemory(result1.ptr, SizedResultHelper<Result::Type>(1)))
.RetiresOnSaturation();
gl_->GetFramebufferAttachmentParameteriv(
- 123,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
+ 123, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
&result);
EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
EXPECT_EQ(static_cast<Result::Type>(1), result);
@@ -735,8 +731,8 @@
Result::Type result = 0;
Cmds expected;
ExpectedMemoryInfo result1 = GetExpectedResultMemory(4);
- expected.cmd.Init(
- 123, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, result1.id, result1.offset);
+ expected.cmd.Init(123, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, result1.id,
+ result1.offset);
EXPECT_CALL(*command_buffer(), OnFlush())
.WillOnce(SetMemory(result1.ptr, SizedResultHelper<Result::Type>(1)))
.RetiresOnSaturation();
@@ -753,8 +749,8 @@
Result::Type result = 0;
Cmds expected;
ExpectedMemoryInfo result1 = GetExpectedResultMemory(4);
- expected.cmd.Init(
- 123, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, result1.id, result1.offset);
+ expected.cmd.Init(123, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, result1.id,
+ result1.offset);
EXPECT_CALL(*command_buffer(), OnFlush())
.WillOnce(SetMemory(result1.ptr, SizedResultHelper<Result::Type>(1)))
.RetiresOnSaturation();
@@ -1599,8 +1595,8 @@
Cmds expected;
expected.cmd.Init(GL_RENDERBUFFER, 2, GL_RGBA4, 4, 5);
- gl_->RenderbufferStorageMultisampleCHROMIUM(
- GL_RENDERBUFFER, 2, GL_RGBA4, 4, 5);
+ gl_->RenderbufferStorageMultisampleCHROMIUM(GL_RENDERBUFFER, 2, GL_RGBA4, 4,
+ 5);
EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
}
@@ -1622,15 +1618,15 @@
Cmds expected;
expected.cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 6);
- gl_->FramebufferTexture2DMultisampleEXT(
- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 0, 6);
+ gl_->FramebufferTexture2DMultisampleEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_TEXTURE_2D, 4, 0, 6);
EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
}
TEST_F(GLES2ImplementationTest,
FramebufferTexture2DMultisampleEXTInvalidConstantArg4) {
- gl_->FramebufferTexture2DMultisampleEXT(
- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 1, 6);
+ gl_->FramebufferTexture2DMultisampleEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_TEXTURE_2D, 4, 1, 6);
EXPECT_TRUE(NoCommandsWritten());
EXPECT_EQ(GL_INVALID_VALUE, CheckError());
}
diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
index 3173a25..cf614a9 100644
--- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
+++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
@@ -149,8 +149,8 @@
GLsizei imageSize,
const void* data) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::CompressedTexImage2D");
- gl_->CompressedTexImage2D(
- target, level, internalformat, width, height, border, imageSize, data);
+ gl_->CompressedTexImage2D(target, level, internalformat, width, height,
+ border, imageSize, data);
}
void GLES2TraceImplementation::CompressedTexSubImage2D(GLenum target,
@@ -163,8 +163,8 @@
GLsizei imageSize,
const void* data) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::CompressedTexSubImage2D");
- gl_->CompressedTexSubImage2D(
- target, level, xoffset, yoffset, width, height, format, imageSize, data);
+ gl_->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height,
+ format, imageSize, data);
}
void GLES2TraceImplementation::CopyTexImage2D(GLenum target,
@@ -176,8 +176,8 @@
GLsizei height,
GLint border) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::CopyTexImage2D");
- gl_->CopyTexImage2D(
- target, level, internalformat, x, y, width, height, border);
+ gl_->CopyTexImage2D(target, level, internalformat, x, y, width, height,
+ border);
}
void GLES2TraceImplementation::CopyTexSubImage2D(GLenum target,
@@ -312,8 +312,8 @@
GLenum renderbuffertarget,
GLuint renderbuffer) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::FramebufferRenderbuffer");
- gl_->FramebufferRenderbuffer(
- target, attachment, renderbuffertarget, renderbuffer);
+ gl_->FramebufferRenderbuffer(target, attachment, renderbuffertarget,
+ renderbuffer);
}
void GLES2TraceImplementation::FramebufferTexture2D(GLenum target,
@@ -719,15 +719,8 @@
GLenum type,
const void* pixels) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::TexImage2D");
- gl_->TexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- pixels);
+ gl_->TexImage2D(target, level, internalformat, width, height, border, format,
+ type, pixels);
}
void GLES2TraceImplementation::TexParameterf(GLenum target,
@@ -768,8 +761,8 @@
GLenum type,
const void* pixels) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::TexSubImage2D");
- gl_->TexSubImage2D(
- target, level, xoffset, yoffset, width, height, format, type, pixels);
+ gl_->TexSubImage2D(target, level, xoffset, yoffset, width, height, format,
+ type, pixels);
}
void GLES2TraceImplementation::Uniform1f(GLint location, GLfloat x) {
@@ -998,8 +991,8 @@
GLbitfield mask,
GLenum filter) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::BlitFramebufferCHROMIUM");
- gl_->BlitFramebufferCHROMIUM(
- srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+ gl_->BlitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
+ dstY1, mask, filter);
}
void GLES2TraceImplementation::RenderbufferStorageMultisampleCHROMIUM(
@@ -1010,8 +1003,8 @@
GLsizei height) {
TRACE_EVENT_BINARY_EFFICIENT0(
"gpu", "GLES2Trace::RenderbufferStorageMultisampleCHROMIUM");
- gl_->RenderbufferStorageMultisampleCHROMIUM(
- target, samples, internalformat, width, height);
+ gl_->RenderbufferStorageMultisampleCHROMIUM(target, samples, internalformat,
+ width, height);
}
void GLES2TraceImplementation::RenderbufferStorageMultisampleEXT(
@@ -1022,8 +1015,8 @@
GLsizei height) {
TRACE_EVENT_BINARY_EFFICIENT0(
"gpu", "GLES2Trace::RenderbufferStorageMultisampleEXT");
- gl_->RenderbufferStorageMultisampleEXT(
- target, samples, internalformat, width, height);
+ gl_->RenderbufferStorageMultisampleEXT(target, samples, internalformat, width,
+ height);
}
void GLES2TraceImplementation::FramebufferTexture2DMultisampleEXT(
@@ -1035,8 +1028,8 @@
GLsizei samples) {
TRACE_EVENT_BINARY_EFFICIENT0(
"gpu", "GLES2Trace::FramebufferTexture2DMultisampleEXT");
- gl_->FramebufferTexture2DMultisampleEXT(
- target, attachment, textarget, texture, level, samples);
+ gl_->FramebufferTexture2DMultisampleEXT(target, attachment, textarget,
+ texture, level, samples);
}
void GLES2TraceImplementation::TexStorage2DEXT(GLenum target,
@@ -1180,8 +1173,8 @@
GLenum type,
GLenum access) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::MapTexSubImage2DCHROMIUM");
- return gl_->MapTexSubImage2DCHROMIUM(
- target, level, xoffset, yoffset, width, height, format, type, access);
+ return gl_->MapTexSubImage2DCHROMIUM(target, level, xoffset, yoffset, width,
+ height, format, type, access);
}
void GLES2TraceImplementation::UnmapTexSubImage2DCHROMIUM(const void* mem) {
@@ -1257,8 +1250,8 @@
GLenum usage) {
TRACE_EVENT_BINARY_EFFICIENT0(
"gpu", "GLES2Trace::CreateGpuMemoryBufferImageCHROMIUM");
- return gl_->CreateGpuMemoryBufferImageCHROMIUM(
- width, height, internalformat, usage);
+ return gl_->CreateGpuMemoryBufferImageCHROMIUM(width, height, internalformat,
+ usage);
}
void GLES2TraceImplementation::GetTranslatedShaderSourceANGLE(GLuint shader,
@@ -1295,8 +1288,8 @@
GLint internalformat,
GLenum dest_type) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::CopyTextureCHROMIUM");
- gl_->CopyTextureCHROMIUM(
- target, source_id, dest_id, level, internalformat, dest_type);
+ gl_->CopyTextureCHROMIUM(target, source_id, dest_id, level, internalformat,
+ dest_type);
}
void GLES2TraceImplementation::DrawArraysInstancedANGLE(GLenum mode,
@@ -1398,8 +1391,8 @@
const void* data) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu",
"GLES2Trace::AsyncTexSubImage2DCHROMIUM");
- gl_->AsyncTexSubImage2DCHROMIUM(
- target, level, xoffset, yoffset, width, height, format, type, data);
+ gl_->AsyncTexSubImage2DCHROMIUM(target, level, xoffset, yoffset, width,
+ height, format, type, data);
}
void GLES2TraceImplementation::AsyncTexImage2DCHROMIUM(GLenum target,
@@ -1412,15 +1405,8 @@
GLenum type,
const void* pixels) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::AsyncTexImage2DCHROMIUM");
- gl_->AsyncTexImage2DCHROMIUM(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- pixels);
+ gl_->AsyncTexImage2DCHROMIUM(target, level, internalformat, width, height,
+ border, format, type, pixels);
}
void GLES2TraceImplementation::WaitAsyncTexImage2DCHROMIUM(GLenum target) {
@@ -1484,17 +1470,9 @@
GLfloat uv_height) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu",
"GLES2Trace::ScheduleOverlayPlaneCHROMIUM");
- gl_->ScheduleOverlayPlaneCHROMIUM(plane_z_order,
- plane_transform,
- overlay_texture_id,
- bounds_x,
- bounds_y,
- bounds_width,
- bounds_height,
- uv_x,
- uv_y,
- uv_width,
- uv_height);
+ gl_->ScheduleOverlayPlaneCHROMIUM(
+ plane_z_order, plane_transform, overlay_texture_id, bounds_x, bounds_y,
+ bounds_width, bounds_height, uv_x, uv_y, uv_width, uv_height);
}
void GLES2TraceImplementation::MatrixLoadfCHROMIUM(GLenum matrixMode,
diff --git a/gpu/command_buffer/common/command_buffer.h b/gpu/command_buffer/common/command_buffer.h
index 61b9142..d846ec1 100644
--- a/gpu/command_buffer/common/command_buffer.h
+++ b/gpu/command_buffer/common/command_buffer.h
@@ -20,24 +20,16 @@
public:
struct State {
State()
- : num_entries(0),
- get_offset(0),
- put_offset(0),
+ : get_offset(0),
token(-1),
error(error::kNoError),
context_lost_reason(error::kUnknown),
generation(0) {
}
- // Size of the command buffer in command buffer entries.
- int32 num_entries;
-
// The offset (in entries) from which the reader is reading.
int32 get_offset;
- // The offset (in entries) at which the writer is writing.
- int32 put_offset;
-
// The current token value. This is used by the writer to defer
// changes to shared memory objects until the reader has reached a certain
// point in the command buffer. The reader is responsible for updating the
diff --git a/gpu/command_buffer/common/command_buffer_mock.h b/gpu/command_buffer/common/command_buffer_mock.h
index 1877470..b7366f8 100644
--- a/gpu/command_buffer/common/command_buffer_mock.h
+++ b/gpu/command_buffer/common/command_buffer_mock.h
@@ -38,6 +38,7 @@
MOCK_METHOD1(SetContextLostReason,
void(error::ContextLostReason context_lost_reason));
MOCK_METHOD0(InsertSyncPoint, uint32());
+ MOCK_METHOD0(GetPutOffset, int32());
private:
DISALLOW_COPY_AND_ASSIGN(MockCommandBuffer);
diff --git a/gpu/command_buffer/common/command_buffer_shared_test.cc b/gpu/command_buffer/common/command_buffer_shared_test.cc
index 65a2429..0615f74 100644
--- a/gpu/command_buffer/common/command_buffer_shared_test.cc
+++ b/gpu/command_buffer/common/command_buffer_shared_test.cc
@@ -29,7 +29,6 @@
EXPECT_LT(state.generation, 0x80000000);
EXPECT_EQ(state.get_offset, 0);
- EXPECT_EQ(state.put_offset, 0);
EXPECT_EQ(state.token, -1);
EXPECT_EQ(state.error, gpu::error::kNoError);
EXPECT_EQ(state.context_lost_reason, gpu::error::kUnknown);
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index 487e8b7..ecef6bb 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -962,13 +962,8 @@
GLsizei _imageSize,
uint32_t _data_shm_id,
uint32_t _data_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(_target,
- _level,
- _internalformat,
- _width,
- _height,
- _imageSize,
- _data_shm_id,
+ static_cast<ValueType*>(cmd)->Init(_target, _level, _internalformat, _width,
+ _height, _imageSize, _data_shm_id,
_data_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -1046,14 +1041,8 @@
GLsizei _height,
GLenum _format,
GLuint _bucket_id) {
- static_cast<ValueType*>(cmd)->Init(_target,
- _level,
- _xoffset,
- _yoffset,
- _width,
- _height,
- _format,
- _bucket_id);
+ static_cast<ValueType*>(cmd)->Init(_target, _level, _xoffset, _yoffset,
+ _width, _height, _format, _bucket_id);
return NextCmdAddress<ValueType>(cmd);
}
@@ -1135,16 +1124,9 @@
GLsizei _imageSize,
uint32_t _data_shm_id,
uint32_t _data_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(_target,
- _level,
- _xoffset,
- _yoffset,
- _width,
- _height,
- _format,
- _imageSize,
- _data_shm_id,
- _data_shm_offset);
+ static_cast<ValueType*>(cmd)->Init(_target, _level, _xoffset, _yoffset,
+ _width, _height, _format, _imageSize,
+ _data_shm_id, _data_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -2436,8 +2418,8 @@
uint32_t _name_bucket_id,
uint32_t _result_shm_id,
uint32_t _result_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(
- _program, _index, _name_bucket_id, _result_shm_id, _result_shm_offset);
+ static_cast<ValueType*>(cmd)->Init(_program, _index, _name_bucket_id,
+ _result_shm_id, _result_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -2506,8 +2488,8 @@
uint32_t _name_bucket_id,
uint32_t _result_shm_id,
uint32_t _result_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(
- _program, _index, _name_bucket_id, _result_shm_id, _result_shm_offset);
+ static_cast<ValueType*>(cmd)->Init(_program, _index, _name_bucket_id,
+ _result_shm_id, _result_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -2625,8 +2607,8 @@
uint32_t _name_bucket_id,
uint32_t _location_shm_id,
uint32_t _location_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(
- _program, _name_bucket_id, _location_shm_id, _location_shm_offset);
+ static_cast<ValueType*>(cmd)->Init(_program, _name_bucket_id,
+ _location_shm_id, _location_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -2870,8 +2852,8 @@
GLenum _pname,
uint32_t _params_shm_id,
uint32_t _params_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(
- _target, _attachment, _pname, _params_shm_id, _params_shm_offset);
+ static_cast<ValueType*>(cmd)->Init(_target, _attachment, _pname,
+ _params_shm_id, _params_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -3572,8 +3554,8 @@
uint32_t _name_bucket_id,
uint32_t _location_shm_id,
uint32_t _location_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(
- _program, _name_bucket_id, _location_shm_id, _location_shm_offset);
+ static_cast<ValueType*>(cmd)->Init(_program, _name_bucket_id,
+ _location_shm_id, _location_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -4313,17 +4295,9 @@
uint32_t _result_shm_id,
uint32_t _result_shm_offset,
GLboolean _async) {
- static_cast<ValueType*>(cmd)->Init(_x,
- _y,
- _width,
- _height,
- _format,
- _type,
- _pixels_shm_id,
- _pixels_shm_offset,
- _result_shm_id,
- _result_shm_offset,
- _async);
+ static_cast<ValueType*>(cmd)
+ ->Init(_x, _y, _width, _height, _format, _type, _pixels_shm_id,
+ _pixels_shm_offset, _result_shm_id, _result_shm_offset, _async);
return NextCmdAddress<ValueType>(cmd);
}
@@ -4557,13 +4531,9 @@
uint32_t _binary_shm_id,
uint32_t _binary_shm_offset,
GLsizei _length) {
- static_cast<ValueType*>(cmd)->Init(_n,
- _shaders_shm_id,
- _shaders_shm_offset,
- _binaryformat,
- _binary_shm_id,
- _binary_shm_offset,
- _length);
+ static_cast<ValueType*>(cmd)->Init(_n, _shaders_shm_id, _shaders_shm_offset,
+ _binaryformat, _binary_shm_id,
+ _binary_shm_offset, _length);
return NextCmdAddress<ValueType>(cmd);
}
@@ -4914,14 +4884,8 @@
GLenum _type,
uint32_t _pixels_shm_id,
uint32_t _pixels_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(_target,
- _level,
- _internalformat,
- _width,
- _height,
- _format,
- _type,
- _pixels_shm_id,
+ static_cast<ValueType*>(cmd)->Init(_target, _level, _internalformat, _width,
+ _height, _format, _type, _pixels_shm_id,
_pixels_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -5178,17 +5142,9 @@
uint32_t _pixels_shm_id,
uint32_t _pixels_shm_offset,
GLboolean _internal) {
- static_cast<ValueType*>(cmd)->Init(_target,
- _level,
- _xoffset,
- _yoffset,
- _width,
- _height,
- _format,
- _type,
- _pixels_shm_id,
- _pixels_shm_offset,
- _internal);
+ static_cast<ValueType*>(cmd)
+ ->Init(_target, _level, _xoffset, _yoffset, _width, _height, _format,
+ _type, _pixels_shm_id, _pixels_shm_offset, _internal);
return NextCmdAddress<ValueType>(cmd);
}
@@ -6615,16 +6571,8 @@
GLint _dstY1,
GLbitfield _mask,
GLenum _filter) {
- static_cast<ValueType*>(cmd)->Init(_srcX0,
- _srcY0,
- _srcX1,
- _srcY1,
- _dstX0,
- _dstY0,
- _dstX1,
- _dstY1,
- _mask,
- _filter);
+ static_cast<ValueType*>(cmd)->Init(_srcX0, _srcY0, _srcX1, _srcY1, _dstX0,
+ _dstY0, _dstX1, _dstY1, _mask, _filter);
return NextCmdAddress<ValueType>(cmd);
}
@@ -7399,8 +7347,8 @@
GLuint _offset,
uint32_t _result_shm_id,
uint32_t _result_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(
- _buffer_id, _count, _type, _offset, _result_shm_id, _result_shm_offset);
+ static_cast<ValueType*>(cmd)->Init(_buffer_id, _count, _type, _offset,
+ _result_shm_id, _result_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -7619,12 +7567,9 @@
uint32_t _results_shm_id,
uint32_t _results_shm_offset,
GLsizeiptr _size) {
- static_cast<ValueType*>(cmd)->Init(_pnames_shm_id,
- _pnames_shm_offset,
- _count,
- _results_shm_id,
- _results_shm_offset,
- _size);
+ static_cast<ValueType*>(cmd)->Init(_pnames_shm_id, _pnames_shm_offset,
+ _count, _results_shm_id,
+ _results_shm_offset, _size);
return NextCmdAddress<ValueType>(cmd);
}
@@ -7878,8 +7823,8 @@
GLint _level,
GLint _internalformat,
GLenum _dest_type) {
- static_cast<ValueType*>(cmd)->Init(
- _target, _source_id, _dest_id, _level, _internalformat, _dest_type);
+ static_cast<ValueType*>(cmd)->Init(_target, _source_id, _dest_id, _level,
+ _internalformat, _dest_type);
return NextCmdAddress<ValueType>(cmd);
}
@@ -8414,19 +8359,10 @@
uint32_t _async_upload_token,
uint32_t _sync_data_shm_id,
uint32_t _sync_data_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(_target,
- _level,
- _xoffset,
- _yoffset,
- _width,
- _height,
- _format,
- _type,
- _data_shm_id,
- _data_shm_offset,
- _async_upload_token,
- _sync_data_shm_id,
- _sync_data_shm_offset);
+ static_cast<ValueType*>(cmd)
+ ->Init(_target, _level, _xoffset, _yoffset, _width, _height, _format,
+ _type, _data_shm_id, _data_shm_offset, _async_upload_token,
+ _sync_data_shm_id, _sync_data_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -8529,18 +8465,10 @@
uint32_t _async_upload_token,
uint32_t _sync_data_shm_id,
uint32_t _sync_data_shm_offset) {
- static_cast<ValueType*>(cmd)->Init(_target,
- _level,
- _internalformat,
- _width,
- _height,
- _format,
- _type,
- _pixels_shm_id,
- _pixels_shm_offset,
- _async_upload_token,
- _sync_data_shm_id,
- _sync_data_shm_offset);
+ static_cast<ValueType*>(cmd)
+ ->Init(_target, _level, _internalformat, _width, _height, _format,
+ _type, _pixels_shm_id, _pixels_shm_offset, _async_upload_token,
+ _sync_data_shm_id, _sync_data_shm_offset);
return NextCmdAddress<ValueType>(cmd);
}
@@ -8886,17 +8814,10 @@
GLfloat _uv_y,
GLfloat _uv_width,
GLfloat _uv_height) {
- static_cast<ValueType*>(cmd)->Init(_plane_z_order,
- _plane_transform,
- _overlay_texture_id,
- _bounds_x,
- _bounds_y,
- _bounds_width,
- _bounds_height,
- _uv_x,
- _uv_y,
- _uv_width,
- _uv_height);
+ static_cast<ValueType*>(cmd)->Init(_plane_z_order, _plane_transform,
+ _overlay_texture_id, _bounds_x,
+ _bounds_y, _bounds_width, _bounds_height,
+ _uv_x, _uv_y, _uv_width, _uv_height);
return NextCmdAddress<ValueType>(cmd);
}
diff --git a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
index b26afb1..7d037a6 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -39,10 +39,8 @@
TEST_F(GLES2FormatTest, BindAttribLocationBucket) {
cmds::BindAttribLocationBucket& cmd =
*GetBufferAs<cmds::BindAttribLocationBucket>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLuint>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11),
+ static_cast<GLuint>(12), static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::BindAttribLocationBucket::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -102,11 +100,9 @@
TEST_F(GLES2FormatTest, BlendColor) {
cmds::BlendColor& cmd = *GetBufferAs<cmds::BlendColor>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLclampf>(11),
- static_cast<GLclampf>(12),
- static_cast<GLclampf>(13),
- static_cast<GLclampf>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLclampf>(11), static_cast<GLclampf>(12),
+ static_cast<GLclampf>(13), static_cast<GLclampf>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::BlendColor::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -153,11 +149,9 @@
TEST_F(GLES2FormatTest, BlendFuncSeparate) {
cmds::BlendFuncSeparate& cmd = *GetBufferAs<cmds::BlendFuncSeparate>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13),
- static_cast<GLenum>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLenum>(13), static_cast<GLenum>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::BlendFuncSeparate::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -170,12 +164,10 @@
TEST_F(GLES2FormatTest, BufferData) {
cmds::BufferData& cmd = *GetBufferAs<cmds::BufferData>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLsizeiptr>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14),
- static_cast<GLenum>(15));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLsizeiptr>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14),
+ static_cast<GLenum>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::BufferData::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -189,12 +181,10 @@
TEST_F(GLES2FormatTest, BufferSubData) {
cmds::BufferSubData& cmd = *GetBufferAs<cmds::BufferSubData>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLintptr>(12),
- static_cast<GLsizeiptr>(13),
- static_cast<uint32_t>(14),
- static_cast<uint32_t>(15));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLintptr>(12),
+ static_cast<GLsizeiptr>(13), static_cast<uint32_t>(14),
+ static_cast<uint32_t>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::BufferSubData::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -209,10 +199,9 @@
TEST_F(GLES2FormatTest, CheckFramebufferStatus) {
cmds::CheckFramebufferStatus& cmd =
*GetBufferAs<cmds::CheckFramebufferStatus>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::CheckFramebufferStatus::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -233,11 +222,9 @@
TEST_F(GLES2FormatTest, ClearColor) {
cmds::ClearColor& cmd = *GetBufferAs<cmds::ClearColor>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLclampf>(11),
- static_cast<GLclampf>(12),
- static_cast<GLclampf>(13),
- static_cast<GLclampf>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLclampf>(11), static_cast<GLclampf>(12),
+ static_cast<GLclampf>(13), static_cast<GLclampf>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::ClearColor::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -270,11 +257,9 @@
TEST_F(GLES2FormatTest, ColorMask) {
cmds::ColorMask& cmd = *GetBufferAs<cmds::ColorMask>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLboolean>(11),
- static_cast<GLboolean>(12),
- static_cast<GLboolean>(13),
- static_cast<GLboolean>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLboolean>(11), static_cast<GLboolean>(12),
+ static_cast<GLboolean>(13), static_cast<GLboolean>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::ColorMask::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLboolean>(11), cmd.red);
@@ -297,13 +282,10 @@
TEST_F(GLES2FormatTest, CompressedTexImage2DBucket) {
cmds::CompressedTexImage2DBucket& cmd =
*GetBufferAs<cmds::CompressedTexImage2DBucket>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLenum>(13),
- static_cast<GLsizei>(14),
- static_cast<GLsizei>(15),
- static_cast<GLuint>(16));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLenum>(13), static_cast<GLsizei>(14),
+ static_cast<GLsizei>(15), static_cast<GLuint>(16));
EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2DBucket::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -318,15 +300,11 @@
TEST_F(GLES2FormatTest, CompressedTexImage2D) {
cmds::CompressedTexImage2D& cmd = *GetBufferAs<cmds::CompressedTexImage2D>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLenum>(13),
- static_cast<GLsizei>(14),
- static_cast<GLsizei>(15),
- static_cast<GLsizei>(16),
- static_cast<uint32_t>(17),
- static_cast<uint32_t>(18));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLenum>(13), static_cast<GLsizei>(14),
+ static_cast<GLsizei>(15), static_cast<GLsizei>(16),
+ static_cast<uint32_t>(17), static_cast<uint32_t>(18));
EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2D::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -344,15 +322,11 @@
TEST_F(GLES2FormatTest, CompressedTexSubImage2DBucket) {
cmds::CompressedTexSubImage2DBucket& cmd =
*GetBufferAs<cmds::CompressedTexSubImage2DBucket>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14),
- static_cast<GLsizei>(15),
- static_cast<GLsizei>(16),
- static_cast<GLenum>(17),
- static_cast<GLuint>(18));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14),
+ static_cast<GLsizei>(15), static_cast<GLsizei>(16),
+ static_cast<GLenum>(17), static_cast<GLuint>(18));
EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexSubImage2DBucket::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -370,17 +344,12 @@
TEST_F(GLES2FormatTest, CompressedTexSubImage2D) {
cmds::CompressedTexSubImage2D& cmd =
*GetBufferAs<cmds::CompressedTexSubImage2D>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14),
- static_cast<GLsizei>(15),
- static_cast<GLsizei>(16),
- static_cast<GLenum>(17),
- static_cast<GLsizei>(18),
- static_cast<uint32_t>(19),
- static_cast<uint32_t>(20));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14),
+ static_cast<GLsizei>(15), static_cast<GLsizei>(16),
+ static_cast<GLenum>(17), static_cast<GLsizei>(18),
+ static_cast<uint32_t>(19), static_cast<uint32_t>(20));
EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexSubImage2D::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -399,14 +368,10 @@
TEST_F(GLES2FormatTest, CopyTexImage2D) {
cmds::CopyTexImage2D& cmd = *GetBufferAs<cmds::CopyTexImage2D>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLenum>(13),
- static_cast<GLint>(14),
- static_cast<GLint>(15),
- static_cast<GLsizei>(16),
- static_cast<GLsizei>(17));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLint>(12), static_cast<GLenum>(13),
+ static_cast<GLint>(14), static_cast<GLint>(15),
+ static_cast<GLsizei>(16), static_cast<GLsizei>(17));
EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTexImage2D::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -422,15 +387,11 @@
TEST_F(GLES2FormatTest, CopyTexSubImage2D) {
cmds::CopyTexSubImage2D& cmd = *GetBufferAs<cmds::CopyTexSubImage2D>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14),
- static_cast<GLint>(15),
- static_cast<GLint>(16),
- static_cast<GLsizei>(17),
- static_cast<GLsizei>(18));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14),
+ static_cast<GLint>(15), static_cast<GLint>(16),
+ static_cast<GLsizei>(17), static_cast<GLsizei>(18));
EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTexSubImage2D::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -632,10 +593,8 @@
TEST_F(GLES2FormatTest, DrawArrays) {
cmds::DrawArrays& cmd = *GetBufferAs<cmds::DrawArrays>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLsizei>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLint>(12), static_cast<GLsizei>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::DrawArrays::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -647,11 +606,9 @@
TEST_F(GLES2FormatTest, DrawElements) {
cmds::DrawElements& cmd = *GetBufferAs<cmds::DrawElements>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLsizei>(12),
- static_cast<GLenum>(13),
- static_cast<GLuint>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLsizei>(12),
+ static_cast<GLenum>(13), static_cast<GLuint>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::DrawElements::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -701,11 +658,9 @@
TEST_F(GLES2FormatTest, FramebufferRenderbuffer) {
cmds::FramebufferRenderbuffer& cmd =
*GetBufferAs<cmds::FramebufferRenderbuffer>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13),
- static_cast<GLuint>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLenum>(13), static_cast<GLuint>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::FramebufferRenderbuffer::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -718,11 +673,9 @@
TEST_F(GLES2FormatTest, FramebufferTexture2D) {
cmds::FramebufferTexture2D& cmd = *GetBufferAs<cmds::FramebufferTexture2D>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13),
- static_cast<GLuint>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLenum>(13), static_cast<GLuint>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::FramebufferTexture2D::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -824,12 +777,10 @@
TEST_F(GLES2FormatTest, GetActiveAttrib) {
cmds::GetActiveAttrib& cmd = *GetBufferAs<cmds::GetActiveAttrib>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLuint>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14),
- static_cast<uint32_t>(15));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLuint>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14),
+ static_cast<uint32_t>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetActiveAttrib::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -843,12 +794,10 @@
TEST_F(GLES2FormatTest, GetActiveUniform) {
cmds::GetActiveUniform& cmd = *GetBufferAs<cmds::GetActiveUniform>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLuint>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14),
- static_cast<uint32_t>(15));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLuint>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14),
+ static_cast<uint32_t>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetActiveUniform::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -862,11 +811,9 @@
TEST_F(GLES2FormatTest, GetAttachedShaders) {
cmds::GetAttachedShaders& cmd = *GetBufferAs<cmds::GetAttachedShaders>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetAttachedShaders::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -879,11 +826,9 @@
TEST_F(GLES2FormatTest, GetAttribLocation) {
cmds::GetAttribLocation& cmd = *GetBufferAs<cmds::GetAttribLocation>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetAttribLocation::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -896,10 +841,9 @@
TEST_F(GLES2FormatTest, GetBooleanv) {
cmds::GetBooleanv& cmd = *GetBufferAs<cmds::GetBooleanv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetBooleanv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -911,11 +855,9 @@
TEST_F(GLES2FormatTest, GetBufferParameteriv) {
cmds::GetBufferParameteriv& cmd = *GetBufferAs<cmds::GetBufferParameteriv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetBufferParameteriv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -939,10 +881,9 @@
TEST_F(GLES2FormatTest, GetFloatv) {
cmds::GetFloatv& cmd = *GetBufferAs<cmds::GetFloatv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetFloatv::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLenum>(11), cmd.pname);
@@ -954,12 +895,10 @@
TEST_F(GLES2FormatTest, GetFramebufferAttachmentParameteriv) {
cmds::GetFramebufferAttachmentParameteriv& cmd =
*GetBufferAs<cmds::GetFramebufferAttachmentParameteriv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13),
- static_cast<uint32_t>(14),
- static_cast<uint32_t>(15));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLenum>(13), static_cast<uint32_t>(14),
+ static_cast<uint32_t>(15));
EXPECT_EQ(
static_cast<uint32_t>(cmds::GetFramebufferAttachmentParameteriv::kCmdId),
cmd.header.command);
@@ -974,10 +913,9 @@
TEST_F(GLES2FormatTest, GetIntegerv) {
cmds::GetIntegerv& cmd = *GetBufferAs<cmds::GetIntegerv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetIntegerv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -989,11 +927,9 @@
TEST_F(GLES2FormatTest, GetProgramiv) {
cmds::GetProgramiv& cmd = *GetBufferAs<cmds::GetProgramiv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetProgramiv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1019,11 +955,9 @@
TEST_F(GLES2FormatTest, GetRenderbufferParameteriv) {
cmds::GetRenderbufferParameteriv& cmd =
*GetBufferAs<cmds::GetRenderbufferParameteriv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetRenderbufferParameteriv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1036,11 +970,9 @@
TEST_F(GLES2FormatTest, GetShaderiv) {
cmds::GetShaderiv& cmd = *GetBufferAs<cmds::GetShaderiv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetShaderiv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1066,11 +998,9 @@
TEST_F(GLES2FormatTest, GetShaderPrecisionFormat) {
cmds::GetShaderPrecisionFormat& cmd =
*GetBufferAs<cmds::GetShaderPrecisionFormat>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetShaderPrecisionFormat::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1106,11 +1036,9 @@
TEST_F(GLES2FormatTest, GetTexParameterfv) {
cmds::GetTexParameterfv& cmd = *GetBufferAs<cmds::GetTexParameterfv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetTexParameterfv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1123,11 +1051,9 @@
TEST_F(GLES2FormatTest, GetTexParameteriv) {
cmds::GetTexParameteriv& cmd = *GetBufferAs<cmds::GetTexParameteriv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetTexParameteriv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1140,11 +1066,9 @@
TEST_F(GLES2FormatTest, GetUniformfv) {
cmds::GetUniformfv& cmd = *GetBufferAs<cmds::GetUniformfv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLint>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLint>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetUniformfv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1157,11 +1081,9 @@
TEST_F(GLES2FormatTest, GetUniformiv) {
cmds::GetUniformiv& cmd = *GetBufferAs<cmds::GetUniformiv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLint>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLint>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetUniformiv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1174,11 +1096,9 @@
TEST_F(GLES2FormatTest, GetUniformLocation) {
cmds::GetUniformLocation& cmd = *GetBufferAs<cmds::GetUniformLocation>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetUniformLocation::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1191,11 +1111,9 @@
TEST_F(GLES2FormatTest, GetVertexAttribfv) {
cmds::GetVertexAttribfv& cmd = *GetBufferAs<cmds::GetVertexAttribfv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetVertexAttribfv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1208,11 +1126,9 @@
TEST_F(GLES2FormatTest, GetVertexAttribiv) {
cmds::GetVertexAttribiv& cmd = *GetBufferAs<cmds::GetVertexAttribiv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetVertexAttribiv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1226,11 +1142,9 @@
TEST_F(GLES2FormatTest, GetVertexAttribPointerv) {
cmds::GetVertexAttribPointerv& cmd =
*GetBufferAs<cmds::GetVertexAttribPointerv>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLenum>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLenum>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetVertexAttribPointerv::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1254,10 +1168,9 @@
TEST_F(GLES2FormatTest, IsBuffer) {
cmds::IsBuffer& cmd = *GetBufferAs<cmds::IsBuffer>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsBuffer::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLuint>(11), cmd.buffer);
@@ -1268,10 +1181,9 @@
TEST_F(GLES2FormatTest, IsEnabled) {
cmds::IsEnabled& cmd = *GetBufferAs<cmds::IsEnabled>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsEnabled::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLenum>(11), cmd.cap);
@@ -1282,10 +1194,9 @@
TEST_F(GLES2FormatTest, IsFramebuffer) {
cmds::IsFramebuffer& cmd = *GetBufferAs<cmds::IsFramebuffer>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsFramebuffer::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1297,10 +1208,9 @@
TEST_F(GLES2FormatTest, IsProgram) {
cmds::IsProgram& cmd = *GetBufferAs<cmds::IsProgram>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsProgram::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
@@ -1311,10 +1221,9 @@
TEST_F(GLES2FormatTest, IsRenderbuffer) {
cmds::IsRenderbuffer& cmd = *GetBufferAs<cmds::IsRenderbuffer>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsRenderbuffer::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1326,10 +1235,9 @@
TEST_F(GLES2FormatTest, IsShader) {
cmds::IsShader& cmd = *GetBufferAs<cmds::IsShader>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsShader::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
@@ -1340,10 +1248,9 @@
TEST_F(GLES2FormatTest, IsTexture) {
cmds::IsTexture& cmd = *GetBufferAs<cmds::IsTexture>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsTexture::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLuint>(11), cmd.texture);
@@ -1397,17 +1304,11 @@
TEST_F(GLES2FormatTest, ReadPixels) {
cmds::ReadPixels& cmd = *GetBufferAs<cmds::ReadPixels>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
- static_cast<GLsizei>(13),
- static_cast<GLsizei>(14),
- static_cast<GLenum>(15),
- static_cast<GLenum>(16),
- static_cast<uint32_t>(17),
- static_cast<uint32_t>(18),
- static_cast<uint32_t>(19),
- static_cast<uint32_t>(20),
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12),
+ static_cast<GLsizei>(13), static_cast<GLsizei>(14),
+ static_cast<GLenum>(15), static_cast<GLenum>(16),
+ static_cast<uint32_t>(17), static_cast<uint32_t>(18),
+ static_cast<uint32_t>(19), static_cast<uint32_t>(20),
static_cast<GLboolean>(21));
EXPECT_EQ(static_cast<uint32_t>(cmds::ReadPixels::kCmdId),
cmd.header.command);
@@ -1438,11 +1339,9 @@
TEST_F(GLES2FormatTest, RenderbufferStorage) {
cmds::RenderbufferStorage& cmd = *GetBufferAs<cmds::RenderbufferStorage>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLsizei>(13),
- static_cast<GLsizei>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLsizei>(13), static_cast<GLsizei>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::RenderbufferStorage::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1467,11 +1366,8 @@
TEST_F(GLES2FormatTest, Scissor) {
cmds::Scissor& cmd = *GetBufferAs<cmds::Scissor>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
- static_cast<GLsizei>(13),
- static_cast<GLsizei>(14));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12),
+ static_cast<GLsizei>(13), static_cast<GLsizei>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::Scissor::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLint>(11), cmd.x);
@@ -1483,14 +1379,10 @@
TEST_F(GLES2FormatTest, ShaderBinary) {
cmds::ShaderBinary& cmd = *GetBufferAs<cmds::ShaderBinary>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLsizei>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13),
- static_cast<GLenum>(14),
- static_cast<uint32_t>(15),
- static_cast<uint32_t>(16),
- static_cast<GLsizei>(17));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(11),
+ static_cast<uint32_t>(12), static_cast<uint32_t>(13),
+ static_cast<GLenum>(14), static_cast<uint32_t>(15),
+ static_cast<uint32_t>(16), static_cast<GLsizei>(17));
EXPECT_EQ(static_cast<uint32_t>(cmds::ShaderBinary::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1518,10 +1410,8 @@
TEST_F(GLES2FormatTest, StencilFunc) {
cmds::StencilFunc& cmd = *GetBufferAs<cmds::StencilFunc>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLuint>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLint>(12), static_cast<GLuint>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::StencilFunc::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1533,11 +1423,9 @@
TEST_F(GLES2FormatTest, StencilFuncSeparate) {
cmds::StencilFuncSeparate& cmd = *GetBufferAs<cmds::StencilFuncSeparate>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLint>(13),
- static_cast<GLuint>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLint>(13), static_cast<GLuint>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::StencilFuncSeparate::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1572,10 +1460,8 @@
TEST_F(GLES2FormatTest, StencilOp) {
cmds::StencilOp& cmd = *GetBufferAs<cmds::StencilOp>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLenum>(12), static_cast<GLenum>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::StencilOp::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLenum>(11), cmd.fail);
@@ -1586,11 +1472,9 @@
TEST_F(GLES2FormatTest, StencilOpSeparate) {
cmds::StencilOpSeparate& cmd = *GetBufferAs<cmds::StencilOpSeparate>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13),
- static_cast<GLenum>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLenum>(13), static_cast<GLenum>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::StencilOpSeparate::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1603,16 +1487,12 @@
TEST_F(GLES2FormatTest, TexImage2D) {
cmds::TexImage2D& cmd = *GetBufferAs<cmds::TexImage2D>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLsizei>(14),
- static_cast<GLsizei>(15),
- static_cast<GLenum>(16),
- static_cast<GLenum>(17),
- static_cast<uint32_t>(18),
- static_cast<uint32_t>(19));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLsizei>(14),
+ static_cast<GLsizei>(15), static_cast<GLenum>(16),
+ static_cast<GLenum>(17), static_cast<uint32_t>(18),
+ static_cast<uint32_t>(19));
EXPECT_EQ(static_cast<uint32_t>(cmds::TexImage2D::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1630,10 +1510,8 @@
TEST_F(GLES2FormatTest, TexParameterf) {
cmds::TexParameterf& cmd = *GetBufferAs<cmds::TexParameterf>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLfloat>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLenum>(12), static_cast<GLfloat>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameterf::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1665,10 +1543,8 @@
TEST_F(GLES2FormatTest, TexParameteri) {
cmds::TexParameteri& cmd = *GetBufferAs<cmds::TexParameteri>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLint>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLenum>(12), static_cast<GLint>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameteri::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1700,18 +1576,12 @@
TEST_F(GLES2FormatTest, TexSubImage2D) {
cmds::TexSubImage2D& cmd = *GetBufferAs<cmds::TexSubImage2D>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14),
- static_cast<GLsizei>(15),
- static_cast<GLsizei>(16),
- static_cast<GLenum>(17),
- static_cast<GLenum>(18),
- static_cast<uint32_t>(19),
- static_cast<uint32_t>(20),
- static_cast<GLboolean>(21));
+ void* next_cmd = cmd.Set(
+ &cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14), static_cast<GLsizei>(15),
+ static_cast<GLsizei>(16), static_cast<GLenum>(17),
+ static_cast<GLenum>(18), static_cast<uint32_t>(19),
+ static_cast<uint32_t>(20), static_cast<GLboolean>(21));
EXPECT_EQ(static_cast<uint32_t>(cmds::TexSubImage2D::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1797,10 +1667,8 @@
TEST_F(GLES2FormatTest, Uniform2f) {
cmds::Uniform2f& cmd = *GetBufferAs<cmds::Uniform2f>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLfloat>(12),
- static_cast<GLfloat>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11),
+ static_cast<GLfloat>(12), static_cast<GLfloat>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2f::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLint>(11), cmd.location);
@@ -1835,9 +1703,7 @@
TEST_F(GLES2FormatTest, Uniform2i) {
cmds::Uniform2i& cmd = *GetBufferAs<cmds::Uniform2i>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12),
static_cast<GLint>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2i::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -1873,11 +1739,9 @@
TEST_F(GLES2FormatTest, Uniform3f) {
cmds::Uniform3f& cmd = *GetBufferAs<cmds::Uniform3f>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLfloat>(12),
- static_cast<GLfloat>(13),
- static_cast<GLfloat>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLfloat>(12),
+ static_cast<GLfloat>(13), static_cast<GLfloat>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3f::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLint>(11), cmd.location);
@@ -1915,11 +1779,8 @@
TEST_F(GLES2FormatTest, Uniform3i) {
cmds::Uniform3i& cmd = *GetBufferAs<cmds::Uniform3i>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3i::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLint>(11), cmd.location);
@@ -1957,12 +1818,9 @@
TEST_F(GLES2FormatTest, Uniform4f) {
cmds::Uniform4f& cmd = *GetBufferAs<cmds::Uniform4f>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLfloat>(12),
- static_cast<GLfloat>(13),
- static_cast<GLfloat>(14),
- static_cast<GLfloat>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11),
+ static_cast<GLfloat>(12), static_cast<GLfloat>(13),
+ static_cast<GLfloat>(14), static_cast<GLfloat>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4f::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLint>(11), cmd.location);
@@ -2003,11 +1861,8 @@
TEST_F(GLES2FormatTest, Uniform4i) {
cmds::Uniform4i& cmd = *GetBufferAs<cmds::Uniform4i>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14),
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14),
static_cast<GLint>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4i::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2220,10 +2075,8 @@
TEST_F(GLES2FormatTest, VertexAttrib2f) {
cmds::VertexAttrib2f& cmd = *GetBufferAs<cmds::VertexAttrib2f>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLfloat>(12),
- static_cast<GLfloat>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11),
+ static_cast<GLfloat>(12), static_cast<GLfloat>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib2f::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2254,11 +2107,9 @@
TEST_F(GLES2FormatTest, VertexAttrib3f) {
cmds::VertexAttrib3f& cmd = *GetBufferAs<cmds::VertexAttrib3f>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLfloat>(12),
- static_cast<GLfloat>(13),
- static_cast<GLfloat>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLfloat>(12),
+ static_cast<GLfloat>(13), static_cast<GLfloat>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib3f::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2291,12 +2142,9 @@
TEST_F(GLES2FormatTest, VertexAttrib4f) {
cmds::VertexAttrib4f& cmd = *GetBufferAs<cmds::VertexAttrib4f>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLfloat>(12),
- static_cast<GLfloat>(13),
- static_cast<GLfloat>(14),
- static_cast<GLfloat>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11),
+ static_cast<GLfloat>(12), static_cast<GLfloat>(13),
+ static_cast<GLfloat>(14), static_cast<GLfloat>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib4f::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2331,13 +2179,10 @@
TEST_F(GLES2FormatTest, VertexAttribPointer) {
cmds::VertexAttribPointer& cmd = *GetBufferAs<cmds::VertexAttribPointer>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLint>(12),
- static_cast<GLenum>(13),
- static_cast<GLboolean>(14),
- static_cast<GLsizei>(15),
- static_cast<GLuint>(16));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLint>(12),
+ static_cast<GLenum>(13), static_cast<GLboolean>(14),
+ static_cast<GLsizei>(15), static_cast<GLuint>(16));
EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttribPointer::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2352,11 +2197,8 @@
TEST_F(GLES2FormatTest, Viewport) {
cmds::Viewport& cmd = *GetBufferAs<cmds::Viewport>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
- static_cast<GLsizei>(13),
- static_cast<GLsizei>(14));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12),
+ static_cast<GLsizei>(13), static_cast<GLsizei>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::Viewport::kCmdId), cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLint>(11), cmd.x);
@@ -2369,17 +2211,11 @@
TEST_F(GLES2FormatTest, BlitFramebufferCHROMIUM) {
cmds::BlitFramebufferCHROMIUM& cmd =
*GetBufferAs<cmds::BlitFramebufferCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14),
- static_cast<GLint>(15),
- static_cast<GLint>(16),
- static_cast<GLint>(17),
- static_cast<GLint>(18),
- static_cast<GLbitfield>(19),
- static_cast<GLenum>(20));
+ void* next_cmd = cmd.Set(
+ &cmd, static_cast<GLint>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14), static_cast<GLint>(15),
+ static_cast<GLint>(16), static_cast<GLint>(17), static_cast<GLint>(18),
+ static_cast<GLbitfield>(19), static_cast<GLenum>(20));
EXPECT_EQ(static_cast<uint32_t>(cmds::BlitFramebufferCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2399,12 +2235,9 @@
TEST_F(GLES2FormatTest, RenderbufferStorageMultisampleCHROMIUM) {
cmds::RenderbufferStorageMultisampleCHROMIUM& cmd =
*GetBufferAs<cmds::RenderbufferStorageMultisampleCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLsizei>(12),
- static_cast<GLenum>(13),
- static_cast<GLsizei>(14),
- static_cast<GLsizei>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLsizei>(12), static_cast<GLenum>(13),
+ static_cast<GLsizei>(14), static_cast<GLsizei>(15));
EXPECT_EQ(static_cast<uint32_t>(
cmds::RenderbufferStorageMultisampleCHROMIUM::kCmdId),
cmd.header.command);
@@ -2420,12 +2253,9 @@
TEST_F(GLES2FormatTest, RenderbufferStorageMultisampleEXT) {
cmds::RenderbufferStorageMultisampleEXT& cmd =
*GetBufferAs<cmds::RenderbufferStorageMultisampleEXT>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLsizei>(12),
- static_cast<GLenum>(13),
- static_cast<GLsizei>(14),
- static_cast<GLsizei>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLsizei>(12), static_cast<GLenum>(13),
+ static_cast<GLsizei>(14), static_cast<GLsizei>(15));
EXPECT_EQ(
static_cast<uint32_t>(cmds::RenderbufferStorageMultisampleEXT::kCmdId),
cmd.header.command);
@@ -2441,12 +2271,9 @@
TEST_F(GLES2FormatTest, FramebufferTexture2DMultisampleEXT) {
cmds::FramebufferTexture2DMultisampleEXT& cmd =
*GetBufferAs<cmds::FramebufferTexture2DMultisampleEXT>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13),
- static_cast<GLuint>(14),
- static_cast<GLsizei>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLenum>(12), static_cast<GLenum>(13),
+ static_cast<GLuint>(14), static_cast<GLsizei>(15));
EXPECT_EQ(
static_cast<uint32_t>(cmds::FramebufferTexture2DMultisampleEXT::kCmdId),
cmd.header.command);
@@ -2461,12 +2288,9 @@
TEST_F(GLES2FormatTest, TexStorage2DEXT) {
cmds::TexStorage2DEXT& cmd = *GetBufferAs<cmds::TexStorage2DEXT>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLsizei>(12),
- static_cast<GLenum>(13),
- static_cast<GLsizei>(14),
- static_cast<GLsizei>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLsizei>(12), static_cast<GLenum>(13),
+ static_cast<GLsizei>(14), static_cast<GLsizei>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::TexStorage2DEXT::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2516,11 +2340,9 @@
TEST_F(GLES2FormatTest, BeginQueryEXT) {
cmds::BeginQueryEXT& cmd = *GetBufferAs<cmds::BeginQueryEXT>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLuint>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12),
+ static_cast<uint32_t>(13), static_cast<uint32_t>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::BeginQueryEXT::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2610,10 +2432,9 @@
TEST_F(GLES2FormatTest, IsVertexArrayOES) {
cmds::IsVertexArrayOES& cmd = *GetBufferAs<cmds::IsVertexArrayOES>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::IsVertexArrayOES::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2645,13 +2466,10 @@
TEST_F(GLES2FormatTest, GetMaxValueInBufferCHROMIUM) {
cmds::GetMaxValueInBufferCHROMIUM& cmd =
*GetBufferAs<cmds::GetMaxValueInBufferCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLsizei>(12),
- static_cast<GLenum>(13),
- static_cast<GLuint>(14),
- static_cast<uint32_t>(15),
- static_cast<uint32_t>(16));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLsizei>(12),
+ static_cast<GLenum>(13), static_cast<GLuint>(14),
+ static_cast<uint32_t>(15), static_cast<uint32_t>(16));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetMaxValueInBufferCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2667,10 +2485,9 @@
TEST_F(GLES2FormatTest, EnableFeatureCHROMIUM) {
cmds::EnableFeatureCHROMIUM& cmd =
*GetBufferAs<cmds::EnableFeatureCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<uint32_t>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
+ static_cast<uint32_t>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::EnableFeatureCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2682,10 +2499,8 @@
TEST_F(GLES2FormatTest, ResizeCHROMIUM) {
cmds::ResizeCHROMIUM& cmd = *GetBufferAs<cmds::ResizeCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLuint>(12),
- static_cast<GLfloat>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11),
+ static_cast<GLuint>(12), static_cast<GLfloat>(13));
EXPECT_EQ(static_cast<uint32_t>(cmds::ResizeCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2721,13 +2536,10 @@
TEST_F(GLES2FormatTest, GetMultipleIntegervCHROMIUM) {
cmds::GetMultipleIntegervCHROMIUM& cmd =
*GetBufferAs<cmds::GetMultipleIntegervCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<uint32_t>(11),
- static_cast<uint32_t>(12),
- static_cast<GLuint>(13),
- static_cast<uint32_t>(14),
- static_cast<uint32_t>(15),
- static_cast<GLsizeiptr>(16));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<uint32_t>(11), static_cast<uint32_t>(12),
+ static_cast<GLuint>(13), static_cast<uint32_t>(14),
+ static_cast<uint32_t>(15), static_cast<GLsizeiptr>(16));
EXPECT_EQ(static_cast<uint32_t>(cmds::GetMultipleIntegervCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2769,11 +2581,8 @@
TEST_F(GLES2FormatTest, PostSubBufferCHROMIUM) {
cmds::PostSubBufferCHROMIUM& cmd =
*GetBufferAs<cmds::PostSubBufferCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::PostSubBufferCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2787,12 +2596,9 @@
TEST_F(GLES2FormatTest, TexImageIOSurface2DCHROMIUM) {
cmds::TexImageIOSurface2DCHROMIUM& cmd =
*GetBufferAs<cmds::TexImageIOSurface2DCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLsizei>(12),
- static_cast<GLsizei>(13),
- static_cast<GLuint>(14),
- static_cast<GLuint>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLsizei>(12), static_cast<GLsizei>(13),
+ static_cast<GLuint>(14), static_cast<GLuint>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::TexImageIOSurface2DCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2806,13 +2612,10 @@
TEST_F(GLES2FormatTest, CopyTextureCHROMIUM) {
cmds::CopyTextureCHROMIUM& cmd = *GetBufferAs<cmds::CopyTextureCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLenum>(12),
- static_cast<GLenum>(13),
- static_cast<GLint>(14),
- static_cast<GLint>(15),
- static_cast<GLenum>(16));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12),
+ static_cast<GLenum>(13), static_cast<GLint>(14),
+ static_cast<GLint>(15), static_cast<GLenum>(16));
EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTextureCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2828,11 +2631,9 @@
TEST_F(GLES2FormatTest, DrawArraysInstancedANGLE) {
cmds::DrawArraysInstancedANGLE& cmd =
*GetBufferAs<cmds::DrawArraysInstancedANGLE>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLsizei>(13),
- static_cast<GLsizei>(14));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLsizei>(13), static_cast<GLsizei>(14));
EXPECT_EQ(static_cast<uint32_t>(cmds::DrawArraysInstancedANGLE::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -2846,12 +2647,9 @@
TEST_F(GLES2FormatTest, DrawElementsInstancedANGLE) {
cmds::DrawElementsInstancedANGLE& cmd =
*GetBufferAs<cmds::DrawElementsInstancedANGLE>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLsizei>(12),
- static_cast<GLenum>(13),
- static_cast<GLuint>(14),
- static_cast<GLsizei>(15));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
+ static_cast<GLsizei>(12), static_cast<GLenum>(13),
+ static_cast<GLuint>(14), static_cast<GLsizei>(15));
EXPECT_EQ(static_cast<uint32_t>(cmds::DrawElementsInstancedANGLE::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -3129,10 +2927,8 @@
TEST_F(GLES2FormatTest, BindUniformLocationCHROMIUMBucket) {
cmds::BindUniformLocationCHROMIUMBucket& cmd =
*GetBufferAs<cmds::BindUniformLocationCHROMIUMBucket>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLint>(12),
- static_cast<uint32_t>(13));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11),
+ static_cast<GLint>(12), static_cast<uint32_t>(13));
EXPECT_EQ(
static_cast<uint32_t>(cmds::BindUniformLocationCHROMIUMBucket::kCmdId),
cmd.header.command);
@@ -3191,20 +2987,13 @@
TEST_F(GLES2FormatTest, AsyncTexSubImage2DCHROMIUM) {
cmds::AsyncTexSubImage2DCHROMIUM& cmd =
*GetBufferAs<cmds::AsyncTexSubImage2DCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLint>(14),
- static_cast<GLsizei>(15),
- static_cast<GLsizei>(16),
- static_cast<GLenum>(17),
- static_cast<GLenum>(18),
- static_cast<uint32_t>(19),
- static_cast<uint32_t>(20),
- static_cast<uint32_t>(21),
- static_cast<uint32_t>(22),
- static_cast<uint32_t>(23));
+ void* next_cmd = cmd.Set(
+ &cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLint>(14), static_cast<GLsizei>(15),
+ static_cast<GLsizei>(16), static_cast<GLenum>(17),
+ static_cast<GLenum>(18), static_cast<uint32_t>(19),
+ static_cast<uint32_t>(20), static_cast<uint32_t>(21),
+ static_cast<uint32_t>(22), static_cast<uint32_t>(23));
EXPECT_EQ(static_cast<uint32_t>(cmds::AsyncTexSubImage2DCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -3227,19 +3016,13 @@
TEST_F(GLES2FormatTest, AsyncTexImage2DCHROMIUM) {
cmds::AsyncTexImage2DCHROMIUM& cmd =
*GetBufferAs<cmds::AsyncTexImage2DCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLenum>(11),
- static_cast<GLint>(12),
- static_cast<GLint>(13),
- static_cast<GLsizei>(14),
- static_cast<GLsizei>(15),
- static_cast<GLenum>(16),
- static_cast<GLenum>(17),
- static_cast<uint32_t>(18),
- static_cast<uint32_t>(19),
- static_cast<uint32_t>(20),
- static_cast<uint32_t>(21),
- static_cast<uint32_t>(22));
+ void* next_cmd =
+ cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
+ static_cast<GLint>(13), static_cast<GLsizei>(14),
+ static_cast<GLsizei>(15), static_cast<GLenum>(16),
+ static_cast<GLenum>(17), static_cast<uint32_t>(18),
+ static_cast<uint32_t>(19), static_cast<uint32_t>(20),
+ static_cast<uint32_t>(21), static_cast<uint32_t>(22));
EXPECT_EQ(static_cast<uint32_t>(cmds::AsyncTexImage2DCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
@@ -3359,18 +3142,12 @@
TEST_F(GLES2FormatTest, ScheduleOverlayPlaneCHROMIUM) {
cmds::ScheduleOverlayPlaneCHROMIUM& cmd =
*GetBufferAs<cmds::ScheduleOverlayPlaneCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLint>(11),
- static_cast<GLenum>(12),
- static_cast<GLuint>(13),
- static_cast<GLint>(14),
- static_cast<GLint>(15),
- static_cast<GLint>(16),
- static_cast<GLint>(17),
- static_cast<GLfloat>(18),
- static_cast<GLfloat>(19),
- static_cast<GLfloat>(20),
- static_cast<GLfloat>(21));
+ void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11),
+ static_cast<GLenum>(12), static_cast<GLuint>(13),
+ static_cast<GLint>(14), static_cast<GLint>(15),
+ static_cast<GLint>(16), static_cast<GLint>(17),
+ static_cast<GLfloat>(18), static_cast<GLfloat>(19),
+ static_cast<GLfloat>(20), static_cast<GLfloat>(21));
EXPECT_EQ(static_cast<uint32_t>(cmds::ScheduleOverlayPlaneCHROMIUM::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
index 5d7cebd..aba98aa 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -3781,8 +3781,8 @@
{GL_DEPTH_ATTACHMENT, "GL_DEPTH_ATTACHMENT"},
{GL_STENCIL_ATTACHMENT, "GL_STENCIL_ATTACHMENT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringBackbufferAttachment(uint32_t value) {
@@ -3791,24 +3791,24 @@
{GL_DEPTH_EXT, "GL_DEPTH_EXT"},
{GL_STENCIL_EXT, "GL_STENCIL_EXT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringBlitFilter(uint32_t value) {
static const EnumToString string_table[] = {
{GL_NEAREST, "GL_NEAREST"}, {GL_LINEAR, "GL_LINEAR"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringBufferParameter(uint32_t value) {
static const EnumToString string_table[] = {
{GL_BUFFER_SIZE, "GL_BUFFER_SIZE"}, {GL_BUFFER_USAGE, "GL_BUFFER_USAGE"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringBufferTarget(uint32_t value) {
@@ -3816,8 +3816,8 @@
{GL_ARRAY_BUFFER, "GL_ARRAY_BUFFER"},
{GL_ELEMENT_ARRAY_BUFFER, "GL_ELEMENT_ARRAY_BUFFER"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringBufferUsage(uint32_t value) {
@@ -3826,8 +3826,8 @@
{GL_STATIC_DRAW, "GL_STATIC_DRAW"},
{GL_DYNAMIC_DRAW, "GL_DYNAMIC_DRAW"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringCapability(uint32_t value) {
@@ -3842,8 +3842,8 @@
{GL_SCISSOR_TEST, "GL_SCISSOR_TEST"},
{GL_STENCIL_TEST, "GL_STENCIL_TEST"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringCmpFunction(uint32_t value) {
@@ -3857,8 +3857,8 @@
{GL_GEQUAL, "GL_GEQUAL"},
{GL_ALWAYS, "GL_ALWAYS"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringCompressedTextureFormat(uint32_t value) {
@@ -3875,8 +3875,8 @@
{GL_TRIANGLE_FAN, "GL_TRIANGLE_FAN"},
{GL_TRIANGLES, "GL_TRIANGLES"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringDstBlendFactor(uint32_t value) {
@@ -3896,8 +3896,8 @@
{GL_CONSTANT_ALPHA, "GL_CONSTANT_ALPHA"},
{GL_ONE_MINUS_CONSTANT_ALPHA, "GL_ONE_MINUS_CONSTANT_ALPHA"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringEquation(uint32_t value) {
@@ -3906,16 +3906,16 @@
{GL_FUNC_SUBTRACT, "GL_FUNC_SUBTRACT"},
{GL_FUNC_REVERSE_SUBTRACT, "GL_FUNC_REVERSE_SUBTRACT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringFaceMode(uint32_t value) {
static const EnumToString string_table[] = {
{GL_CW, "GL_CW"}, {GL_CCW, "GL_CCW"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringFaceType(uint32_t value) {
@@ -3924,8 +3924,8 @@
{GL_BACK, "GL_BACK"},
{GL_FRONT_AND_BACK, "GL_FRONT_AND_BACK"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringFrameBufferParameter(uint32_t value) {
@@ -3939,16 +3939,16 @@
{GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE,
"GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringFrameBufferTarget(uint32_t value) {
static const EnumToString string_table[] = {
{GL_FRAMEBUFFER, "GL_FRAMEBUFFER"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringGLState(uint32_t value) {
@@ -4050,8 +4050,8 @@
{GL_SCISSOR_TEST, "GL_SCISSOR_TEST"},
{GL_STENCIL_TEST, "GL_STENCIL_TEST"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringGetMaxIndexType(uint32_t value) {
@@ -4060,8 +4060,8 @@
{GL_UNSIGNED_SHORT, "GL_UNSIGNED_SHORT"},
{GL_UNSIGNED_INT, "GL_UNSIGNED_INT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringGetTexParamTarget(uint32_t value) {
@@ -4069,8 +4069,8 @@
{GL_TEXTURE_2D, "GL_TEXTURE_2D"},
{GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringHintMode(uint32_t value) {
@@ -4079,24 +4079,24 @@
{GL_NICEST, "GL_NICEST"},
{GL_DONT_CARE, "GL_DONT_CARE"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringHintTarget(uint32_t value) {
static const EnumToString string_table[] = {
{GL_GENERATE_MIPMAP_HINT, "GL_GENERATE_MIPMAP_HINT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringImageInternalFormat(uint32_t value) {
static const EnumToString string_table[] = {
{GL_RGB, "GL_RGB"}, {GL_RGBA, "GL_RGBA"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringImageUsage(uint32_t value) {
@@ -4104,8 +4104,8 @@
{GL_MAP_CHROMIUM, "GL_MAP_CHROMIUM"},
{GL_SCANOUT_CHROMIUM, "GL_SCANOUT_CHROMIUM"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringIndexType(uint32_t value) {
@@ -4113,8 +4113,8 @@
{GL_UNSIGNED_BYTE, "GL_UNSIGNED_BYTE"},
{GL_UNSIGNED_SHORT, "GL_UNSIGNED_SHORT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringMatrixMode(uint32_t value) {
@@ -4122,8 +4122,8 @@
{GL_PATH_PROJECTION_CHROMIUM, "GL_PATH_PROJECTION_CHROMIUM"},
{GL_PATH_MODELVIEW_CHROMIUM, "GL_PATH_MODELVIEW_CHROMIUM"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringPixelStore(uint32_t value) {
@@ -4136,8 +4136,8 @@
{GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM,
"GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringPixelType(uint32_t value) {
@@ -4147,8 +4147,8 @@
{GL_UNSIGNED_SHORT_4_4_4_4, "GL_UNSIGNED_SHORT_4_4_4_4"},
{GL_UNSIGNED_SHORT_5_5_5_1, "GL_UNSIGNED_SHORT_5_5_5_1"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringProgramParameter(uint32_t value) {
@@ -4163,8 +4163,8 @@
{GL_ACTIVE_UNIFORMS, "GL_ACTIVE_UNIFORMS"},
{GL_ACTIVE_UNIFORM_MAX_LENGTH, "GL_ACTIVE_UNIFORM_MAX_LENGTH"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringQueryObjectParameter(uint32_t value) {
@@ -4172,16 +4172,16 @@
{GL_QUERY_RESULT_EXT, "GL_QUERY_RESULT_EXT"},
{GL_QUERY_RESULT_AVAILABLE_EXT, "GL_QUERY_RESULT_AVAILABLE_EXT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringQueryParameter(uint32_t value) {
static const EnumToString string_table[] = {
{GL_CURRENT_QUERY_EXT, "GL_CURRENT_QUERY_EXT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringQueryTarget(uint32_t value) {
@@ -4197,16 +4197,16 @@
"GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM"},
{GL_COMMANDS_COMPLETED_CHROMIUM, "GL_COMMANDS_COMPLETED_CHROMIUM"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringReadPixelFormat(uint32_t value) {
static const EnumToString string_table[] = {
{GL_ALPHA, "GL_ALPHA"}, {GL_RGB, "GL_RGB"}, {GL_RGBA, "GL_RGBA"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringReadPixelType(uint32_t value) {
@@ -4216,8 +4216,8 @@
{GL_UNSIGNED_SHORT_4_4_4_4, "GL_UNSIGNED_SHORT_4_4_4_4"},
{GL_UNSIGNED_SHORT_5_5_5_1, "GL_UNSIGNED_SHORT_5_5_5_1"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringRenderBufferFormat(uint32_t value) {
@@ -4228,8 +4228,8 @@
{GL_DEPTH_COMPONENT16, "GL_DEPTH_COMPONENT16"},
{GL_STENCIL_INDEX8, "GL_STENCIL_INDEX8"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringRenderBufferParameter(uint32_t value) {
@@ -4244,16 +4244,16 @@
{GL_RENDERBUFFER_HEIGHT, "GL_RENDERBUFFER_HEIGHT"},
{GL_RENDERBUFFER_INTERNAL_FORMAT, "GL_RENDERBUFFER_INTERNAL_FORMAT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringRenderBufferTarget(uint32_t value) {
static const EnumToString string_table[] = {
{GL_RENDERBUFFER, "GL_RENDERBUFFER"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringResetStatus(uint32_t value) {
@@ -4262,8 +4262,8 @@
{GL_INNOCENT_CONTEXT_RESET_ARB, "GL_INNOCENT_CONTEXT_RESET_ARB"},
{GL_UNKNOWN_CONTEXT_RESET_ARB, "GL_UNKNOWN_CONTEXT_RESET_ARB"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringShaderBinaryFormat(uint32_t value) {
@@ -4280,8 +4280,8 @@
{GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE,
"GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringShaderPrecision(uint32_t value) {
@@ -4293,8 +4293,8 @@
{GL_MEDIUM_INT, "GL_MEDIUM_INT"},
{GL_HIGH_INT, "GL_HIGH_INT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringShaderType(uint32_t value) {
@@ -4302,8 +4302,8 @@
{GL_VERTEX_SHADER, "GL_VERTEX_SHADER"},
{GL_FRAGMENT_SHADER, "GL_FRAGMENT_SHADER"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringSrcBlendFactor(uint32_t value) {
@@ -4324,8 +4324,8 @@
{GL_ONE_MINUS_CONSTANT_ALPHA, "GL_ONE_MINUS_CONSTANT_ALPHA"},
{GL_SRC_ALPHA_SATURATE, "GL_SRC_ALPHA_SATURATE"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringStencilOp(uint32_t value) {
@@ -4339,8 +4339,8 @@
{GL_DECR_WRAP, "GL_DECR_WRAP"},
{GL_INVERT, "GL_INVERT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringStringType(uint32_t value) {
@@ -4351,8 +4351,8 @@
{GL_SHADING_LANGUAGE_VERSION, "GL_SHADING_LANGUAGE_VERSION"},
{GL_EXTENSIONS, "GL_EXTENSIONS"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureBindTarget(uint32_t value) {
@@ -4360,8 +4360,8 @@
{GL_TEXTURE_2D, "GL_TEXTURE_2D"},
{GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureFormat(uint32_t value) {
@@ -4372,8 +4372,8 @@
{GL_RGB, "GL_RGB"},
{GL_RGBA, "GL_RGBA"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureInternalFormat(uint32_t value) {
@@ -4384,8 +4384,8 @@
{GL_RGB, "GL_RGB"},
{GL_RGBA, "GL_RGBA"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureInternalFormatStorage(uint32_t value) {
@@ -4399,16 +4399,16 @@
{GL_RGB8_OES, "GL_RGB8_OES"},
{GL_RGBA8_OES, "GL_RGBA8_OES"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureMagFilterMode(uint32_t value) {
static const EnumToString string_table[] = {
{GL_NEAREST, "GL_NEAREST"}, {GL_LINEAR, "GL_LINEAR"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureMinFilterMode(uint32_t value) {
@@ -4420,8 +4420,8 @@
{GL_NEAREST_MIPMAP_LINEAR, "GL_NEAREST_MIPMAP_LINEAR"},
{GL_LINEAR_MIPMAP_LINEAR, "GL_LINEAR_MIPMAP_LINEAR"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureParameter(uint32_t value) {
@@ -4432,8 +4432,8 @@
{GL_TEXTURE_WRAP_S, "GL_TEXTURE_WRAP_S"},
{GL_TEXTURE_WRAP_T, "GL_TEXTURE_WRAP_T"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTexturePool(uint32_t value) {
@@ -4442,8 +4442,8 @@
{GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
"GL_TEXTURE_POOL_UNMANAGED_CHROMIUM"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureTarget(uint32_t value) {
@@ -4456,8 +4456,8 @@
{GL_TEXTURE_CUBE_MAP_POSITIVE_Z, "GL_TEXTURE_CUBE_MAP_POSITIVE_Z"},
{GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureUsage(uint32_t value) {
@@ -4465,8 +4465,8 @@
{GL_NONE, "GL_NONE"},
{GL_FRAMEBUFFER_ATTACHMENT_ANGLE, "GL_FRAMEBUFFER_ATTACHMENT_ANGLE"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringTextureWrapMode(uint32_t value) {
@@ -4475,8 +4475,8 @@
{GL_MIRRORED_REPEAT, "GL_MIRRORED_REPEAT"},
{GL_REPEAT, "GL_REPEAT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringVertexAttribType(uint32_t value) {
@@ -4487,8 +4487,8 @@
{GL_UNSIGNED_SHORT, "GL_UNSIGNED_SHORT"},
{GL_FLOAT, "GL_FLOAT"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringVertexAttribute(uint32_t value) {
@@ -4502,16 +4502,16 @@
{GL_VERTEX_ATTRIB_ARRAY_TYPE, "GL_VERTEX_ATTRIB_ARRAY_TYPE"},
{GL_CURRENT_VERTEX_ATTRIB, "GL_CURRENT_VERTEX_ATTRIB"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
std::string GLES2Util::GetStringVertexPointer(uint32_t value) {
static const EnumToString string_table[] = {
{GL_VERTEX_ATTRIB_ARRAY_POINTER, "GL_VERTEX_ATTRIB_ARRAY_POINTER"},
};
- return GLES2Util::GetQualifiedEnumString(
- string_table, arraysize(string_table), value);
+ return GLES2Util::GetQualifiedEnumString(string_table,
+ arraysize(string_table), value);
}
#endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_IMPLEMENTATION_AUTOGEN_H_
diff --git a/gpu/command_buffer/service/command_buffer_service.cc b/gpu/command_buffer/service/command_buffer_service.cc
index 2c732c6..1453a0a 100644
--- a/gpu/command_buffer/service/command_buffer_service.cc
+++ b/gpu/command_buffer/service/command_buffer_service.cc
@@ -39,9 +39,7 @@
CommandBufferService::State CommandBufferService::GetLastState() {
State state;
- state.num_entries = num_entries_;
state.get_offset = get_offset_;
- state.put_offset = put_offset_;
state.token = token_;
state.error = error_;
state.context_lost_reason = context_lost_reason_;
@@ -174,6 +172,10 @@
context_lost_reason_ = reason;
}
+int32 CommandBufferService::GetPutOffset() {
+ return put_offset_;
+}
+
void CommandBufferService::SetPutOffsetChangeCallback(
const base::Closure& callback) {
put_offset_change_callback_ = callback;
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index 15f865f..69b9ad7 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -33,6 +33,9 @@
// NOTE: if calling this in conjunction with SetParseError,
// call this first.
virtual void SetContextLostReason(error::ContextLostReason) = 0;
+
+ // Allows the reader to obtain the current put offset.
+ virtual int32 GetPutOffset() = 0;
};
// An object that implements a shared memory command buffer and a synchronous
@@ -61,6 +64,7 @@
void SetToken(int32 token) override;
void SetParseError(error::Error error) override;
void SetContextLostReason(error::ContextLostReason) override;
+ int32 GetPutOffset() override;
// Sets a callback that is called whenever the put offset is changed. When
// called with sync==true, the callback must not return until some progress
diff --git a/gpu/command_buffer/service/command_buffer_service_unittest.cc b/gpu/command_buffer/service/command_buffer_service_unittest.cc
index 3af2d05..8a7d43c 100644
--- a/gpu/command_buffer/service/command_buffer_service_unittest.cc
+++ b/gpu/command_buffer/service/command_buffer_service_unittest.cc
@@ -38,7 +38,7 @@
}
int32 GetPutOffset() {
- return command_buffer_->GetLastState().put_offset;
+ return command_buffer_->GetPutOffset();
}
int32 GetToken() {
@@ -65,7 +65,7 @@
EXPECT_TRUE(Initialize(1024));
CommandBuffer::State state = command_buffer_->GetLastState();
EXPECT_EQ(0, state.get_offset);
- EXPECT_EQ(0, state.put_offset);
+ EXPECT_EQ(0, command_buffer_->GetPutOffset());
EXPECT_EQ(0, state.token);
EXPECT_EQ(error::kNoError, state.error);
}
diff --git a/gpu/command_buffer/service/context_state_impl_autogen.h b/gpu/command_buffer/service/context_state_impl_autogen.h
index 1b1e5fe..037ac6c 100644
--- a/gpu/command_buffer/service/context_state_impl_autogen.h
+++ b/gpu/command_buffer/service/context_state_impl_autogen.h
@@ -182,9 +182,7 @@
(blend_color_green != prev_state->blend_color_green) ||
(blend_color_blue != prev_state->blend_color_blue) ||
(blend_color_alpha != prev_state->blend_color_alpha))
- glBlendColor(blend_color_red,
- blend_color_green,
- blend_color_blue,
+ glBlendColor(blend_color_red, blend_color_green, blend_color_blue,
blend_color_alpha);
if ((blend_equation_rgb != prev_state->blend_equation_rgb) ||
(blend_equation_alpha != prev_state->blend_equation_alpha))
@@ -193,17 +191,13 @@
(blend_dest_rgb != prev_state->blend_dest_rgb) ||
(blend_source_alpha != prev_state->blend_source_alpha) ||
(blend_dest_alpha != prev_state->blend_dest_alpha))
- glBlendFuncSeparate(blend_source_rgb,
- blend_dest_rgb,
- blend_source_alpha,
+ glBlendFuncSeparate(blend_source_rgb, blend_dest_rgb, blend_source_alpha,
blend_dest_alpha);
if ((color_clear_red != prev_state->color_clear_red) ||
(color_clear_green != prev_state->color_clear_green) ||
(color_clear_blue != prev_state->color_clear_blue) ||
(color_clear_alpha != prev_state->color_clear_alpha))
- glClearColor(color_clear_red,
- color_clear_green,
- color_clear_blue,
+ glClearColor(color_clear_red, color_clear_green, color_clear_blue,
color_clear_alpha);
if ((depth_clear != prev_state->depth_clear))
glClearDepth(depth_clear);
@@ -213,10 +207,8 @@
(cached_color_mask_green != prev_state->cached_color_mask_green) ||
(cached_color_mask_blue != prev_state->cached_color_mask_blue) ||
(cached_color_mask_alpha != prev_state->cached_color_mask_alpha))
- glColorMask(cached_color_mask_red,
- cached_color_mask_green,
- cached_color_mask_blue,
- cached_color_mask_alpha);
+ glColorMask(cached_color_mask_red, cached_color_mask_green,
+ cached_color_mask_blue, cached_color_mask_alpha);
if ((cull_mode != prev_state->cull_mode))
glCullFace(cull_mode);
if ((depth_func != prev_state->depth_func))
@@ -240,15 +232,13 @@
if ((line_width != prev_state->line_width))
glLineWidth(line_width);
if (feature_info_->feature_flags().chromium_path_rendering) {
- if (memcmp(prev_state->modelview_matrix,
- modelview_matrix,
+ if (memcmp(prev_state->modelview_matrix, modelview_matrix,
sizeof(GLfloat) * 16)) {
glMatrixLoadfEXT(GL_PATH_MODELVIEW_CHROMIUM, modelview_matrix);
}
}
if (feature_info_->feature_flags().chromium_path_rendering) {
- if (memcmp(prev_state->projection_matrix,
- projection_matrix,
+ if (memcmp(prev_state->projection_matrix, projection_matrix,
sizeof(GLfloat) * 16)) {
glMatrixLoadfEXT(GL_PATH_PROJECTION_CHROMIUM, projection_matrix);
}
@@ -273,13 +263,13 @@
if ((stencil_front_func != prev_state->stencil_front_func) ||
(stencil_front_ref != prev_state->stencil_front_ref) ||
(stencil_front_mask != prev_state->stencil_front_mask))
- glStencilFuncSeparate(
- GL_FRONT, stencil_front_func, stencil_front_ref, stencil_front_mask);
+ glStencilFuncSeparate(GL_FRONT, stencil_front_func, stencil_front_ref,
+ stencil_front_mask);
if ((stencil_back_func != prev_state->stencil_back_func) ||
(stencil_back_ref != prev_state->stencil_back_ref) ||
(stencil_back_mask != prev_state->stencil_back_mask))
- glStencilFuncSeparate(
- GL_BACK, stencil_back_func, stencil_back_ref, stencil_back_mask);
+ glStencilFuncSeparate(GL_BACK, stencil_back_func, stencil_back_ref,
+ stencil_back_mask);
if ((cached_stencil_front_writemask !=
prev_state->cached_stencil_front_writemask))
glStencilMaskSeparate(GL_FRONT, cached_stencil_front_writemask);
@@ -289,16 +279,12 @@
if ((stencil_front_fail_op != prev_state->stencil_front_fail_op) ||
(stencil_front_z_fail_op != prev_state->stencil_front_z_fail_op) ||
(stencil_front_z_pass_op != prev_state->stencil_front_z_pass_op))
- glStencilOpSeparate(GL_FRONT,
- stencil_front_fail_op,
- stencil_front_z_fail_op,
- stencil_front_z_pass_op);
+ glStencilOpSeparate(GL_FRONT, stencil_front_fail_op,
+ stencil_front_z_fail_op, stencil_front_z_pass_op);
if ((stencil_back_fail_op != prev_state->stencil_back_fail_op) ||
(stencil_back_z_fail_op != prev_state->stencil_back_z_fail_op) ||
(stencil_back_z_pass_op != prev_state->stencil_back_z_pass_op))
- glStencilOpSeparate(GL_BACK,
- stencil_back_fail_op,
- stencil_back_z_fail_op,
+ glStencilOpSeparate(GL_BACK, stencil_back_fail_op, stencil_back_z_fail_op,
stencil_back_z_pass_op);
if ((viewport_x != prev_state->viewport_x) ||
(viewport_y != prev_state->viewport_y) ||
@@ -306,23 +292,17 @@
(viewport_height != prev_state->viewport_height))
glViewport(viewport_x, viewport_y, viewport_width, viewport_height);
} else {
- glBlendColor(blend_color_red,
- blend_color_green,
- blend_color_blue,
+ glBlendColor(blend_color_red, blend_color_green, blend_color_blue,
blend_color_alpha);
glBlendEquationSeparate(blend_equation_rgb, blend_equation_alpha);
- glBlendFuncSeparate(
- blend_source_rgb, blend_dest_rgb, blend_source_alpha, blend_dest_alpha);
- glClearColor(color_clear_red,
- color_clear_green,
- color_clear_blue,
+ glBlendFuncSeparate(blend_source_rgb, blend_dest_rgb, blend_source_alpha,
+ blend_dest_alpha);
+ glClearColor(color_clear_red, color_clear_green, color_clear_blue,
color_clear_alpha);
glClearDepth(depth_clear);
glClearStencil(stencil_clear);
- glColorMask(cached_color_mask_red,
- cached_color_mask_green,
- cached_color_mask_blue,
- cached_color_mask_alpha);
+ glColorMask(cached_color_mask_red, cached_color_mask_green,
+ cached_color_mask_blue, cached_color_mask_alpha);
glCullFace(cull_mode);
glDepthFunc(depth_func);
glDepthMask(cached_depth_mask);
@@ -345,19 +325,15 @@
glPolygonOffset(polygon_offset_factor, polygon_offset_units);
glSampleCoverage(sample_coverage_value, sample_coverage_invert);
glScissor(scissor_x, scissor_y, scissor_width, scissor_height);
- glStencilFuncSeparate(
- GL_FRONT, stencil_front_func, stencil_front_ref, stencil_front_mask);
- glStencilFuncSeparate(
- GL_BACK, stencil_back_func, stencil_back_ref, stencil_back_mask);
+ glStencilFuncSeparate(GL_FRONT, stencil_front_func, stencil_front_ref,
+ stencil_front_mask);
+ glStencilFuncSeparate(GL_BACK, stencil_back_func, stencil_back_ref,
+ stencil_back_mask);
glStencilMaskSeparate(GL_FRONT, cached_stencil_front_writemask);
glStencilMaskSeparate(GL_BACK, cached_stencil_back_writemask);
- glStencilOpSeparate(GL_FRONT,
- stencil_front_fail_op,
- stencil_front_z_fail_op,
- stencil_front_z_pass_op);
- glStencilOpSeparate(GL_BACK,
- stencil_back_fail_op,
- stencil_back_z_fail_op,
+ glStencilOpSeparate(GL_FRONT, stencil_front_fail_op,
+ stencil_front_z_fail_op, stencil_front_z_pass_op);
+ glStencilOpSeparate(GL_BACK, stencil_back_fail_op, stencil_back_z_fail_op,
stencil_back_z_pass_op);
glViewport(viewport_x, viewport_y, viewport_width, viewport_height);
}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 02d914f..86b36ca 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -143,13 +143,13 @@
GLenum modeRGB = static_cast<GLenum>(c.modeRGB);
GLenum modeAlpha = static_cast<GLenum>(c.modeAlpha);
if (!validators_->equation.IsValid(modeRGB)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glBlendEquationSeparate", modeRGB, "modeRGB");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glBlendEquationSeparate", modeRGB,
+ "modeRGB");
return error::kNoError;
}
if (!validators_->equation.IsValid(modeAlpha)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glBlendEquationSeparate", modeAlpha, "modeAlpha");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glBlendEquationSeparate", modeAlpha,
+ "modeAlpha");
return error::kNoError;
}
if (state_.blend_equation_rgb != modeRGB ||
@@ -207,13 +207,13 @@
return error::kNoError;
}
if (!validators_->src_blend_factor.IsValid(srcAlpha)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glBlendFuncSeparate", srcAlpha, "srcAlpha");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glBlendFuncSeparate", srcAlpha,
+ "srcAlpha");
return error::kNoError;
}
if (!validators_->dst_blend_factor.IsValid(dstAlpha)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glBlendFuncSeparate", dstAlpha, "dstAlpha");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glBlendFuncSeparate", dstAlpha,
+ "dstAlpha");
return error::kNoError;
}
if (state_.blend_source_rgb != srcRGB || state_.blend_dest_rgb != dstRGB ||
@@ -268,8 +268,8 @@
return error::kOutOfBounds;
}
if (!validators_->frame_buffer_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glCheckFramebufferStatus", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glCheckFramebufferStatus", target,
+ "target");
return error::kNoError;
}
*result_dst = DoCheckFramebufferStatus(target);
@@ -384,35 +384,35 @@
const void* data = GetSharedMemoryAs<const void*>(
c.data_shm_id, c.data_shm_offset, data_size);
if (!validators_->texture_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glCompressedTexSubImage2D", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glCompressedTexSubImage2D", target,
+ "target");
return error::kNoError;
}
if (width < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glCompressedTexSubImage2D", "width < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedTexSubImage2D",
+ "width < 0");
return error::kNoError;
}
if (height < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glCompressedTexSubImage2D", "height < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedTexSubImage2D",
+ "height < 0");
return error::kNoError;
}
if (!validators_->compressed_texture_format.IsValid(format)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glCompressedTexSubImage2D", format, "format");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glCompressedTexSubImage2D", format,
+ "format");
return error::kNoError;
}
if (imageSize < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glCompressedTexSubImage2D", "imageSize < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedTexSubImage2D",
+ "imageSize < 0");
return error::kNoError;
}
if (data == NULL) {
return error::kOutOfBounds;
}
- DoCompressedTexSubImage2D(
- target, level, xoffset, yoffset, width, height, format, imageSize, data);
+ DoCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height,
+ format, imageSize, data);
return error::kNoError;
}
@@ -439,8 +439,8 @@
return error::kNoError;
}
if (!validators_->texture_internal_format.IsValid(internalformat)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glCopyTexImage2D", internalformat, "internalformat");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glCopyTexImage2D", internalformat,
+ "internalformat");
return error::kNoError;
}
if (width < 0) {
@@ -750,22 +750,22 @@
GLenum renderbuffertarget = static_cast<GLenum>(c.renderbuffertarget);
GLuint renderbuffer = c.renderbuffer;
if (!validators_->frame_buffer_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferRenderbuffer", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferRenderbuffer", target,
+ "target");
return error::kNoError;
}
if (!validators_->attachment.IsValid(attachment)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferRenderbuffer", attachment, "attachment");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferRenderbuffer", attachment,
+ "attachment");
return error::kNoError;
}
if (!validators_->render_buffer_target.IsValid(renderbuffertarget)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferRenderbuffer", renderbuffertarget, "renderbuffertarget");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferRenderbuffer",
+ renderbuffertarget, "renderbuffertarget");
return error::kNoError;
}
- DoFramebufferRenderbuffer(
- target, attachment, renderbuffertarget, renderbuffer);
+ DoFramebufferRenderbuffer(target, attachment, renderbuffertarget,
+ renderbuffer);
return error::kNoError;
}
@@ -785,13 +785,13 @@
return error::kNoError;
}
if (!validators_->attachment.IsValid(attachment)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferTexture2D", attachment, "attachment");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferTexture2D", attachment,
+ "attachment");
return error::kNoError;
}
if (!validators_->texture_target.IsValid(textarget)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferTexture2D", textarget, "textarget");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferTexture2D", textarget,
+ "textarget");
return error::kNoError;
}
DoFramebufferTexture2D(target, attachment, textarget, texture, level);
@@ -1051,18 +1051,18 @@
c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
GLint* params = result ? result->GetData() : NULL;
if (!validators_->frame_buffer_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glGetFramebufferAttachmentParameteriv", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glGetFramebufferAttachmentParameteriv",
+ target, "target");
return error::kNoError;
}
if (!validators_->attachment.IsValid(attachment)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glGetFramebufferAttachmentParameteriv", attachment, "attachment");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glGetFramebufferAttachmentParameteriv",
+ attachment, "attachment");
return error::kNoError;
}
if (!validators_->frame_buffer_parameter.IsValid(pname)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glGetFramebufferAttachmentParameteriv", pname, "pname");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glGetFramebufferAttachmentParameteriv",
+ pname, "pname");
return error::kNoError;
}
if (params == NULL) {
@@ -1167,13 +1167,13 @@
c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
GLint* params = result ? result->GetData() : NULL;
if (!validators_->render_buffer_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glGetRenderbufferParameteriv", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glGetRenderbufferParameteriv", target,
+ "target");
return error::kNoError;
}
if (!validators_->render_buffer_parameter.IsValid(pname)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glGetRenderbufferParameteriv", pname, "pname");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glGetRenderbufferParameteriv", pname,
+ "pname");
return error::kNoError;
}
if (params == NULL) {
@@ -1599,8 +1599,8 @@
return error::kNoError;
}
if (!validators_->render_buffer_format.IsValid(internalformat)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glRenderbufferStorage", internalformat, "internalformat");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glRenderbufferStorage", internalformat,
+ "internalformat");
return error::kNoError;
}
if (width < 0) {
@@ -2549,8 +2549,7 @@
*static_cast<const gles2::cmds::BlitFramebufferCHROMIUM*>(cmd_data);
(void)c;
if (!features().chromium_framebuffer_multisample) {
- LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
- "glBlitFramebufferCHROMIUM",
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glBlitFramebufferCHROMIUM",
"function not available");
return error::kNoError;
}
@@ -2573,12 +2572,12 @@
GLbitfield mask = static_cast<GLbitfield>(c.mask);
GLenum filter = static_cast<GLenum>(c.filter);
if (!validators_->blit_filter.IsValid(filter)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glBlitFramebufferCHROMIUM", filter, "filter");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glBlitFramebufferCHROMIUM", filter,
+ "filter");
return error::kNoError;
}
- DoBlitFramebufferCHROMIUM(
- srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+ DoBlitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
+ dstY1, mask, filter);
return error::kNoError;
}
@@ -2602,8 +2601,8 @@
GLsizei width = static_cast<GLsizei>(c.width);
GLsizei height = static_cast<GLsizei>(c.height);
if (!validators_->render_buffer_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glRenderbufferStorageMultisampleCHROMIUM", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glRenderbufferStorageMultisampleCHROMIUM",
+ target, "target");
return error::kNoError;
}
if (samples < 0) {
@@ -2614,14 +2613,12 @@
}
if (!validators_->render_buffer_format.IsValid(internalformat)) {
LOCAL_SET_GL_ERROR_INVALID_ENUM("glRenderbufferStorageMultisampleCHROMIUM",
- internalformat,
- "internalformat");
+ internalformat, "internalformat");
return error::kNoError;
}
if (width < 0) {
LOCAL_SET_GL_ERROR(GL_INVALID_VALUE,
- "glRenderbufferStorageMultisampleCHROMIUM",
- "width < 0");
+ "glRenderbufferStorageMultisampleCHROMIUM", "width < 0");
return error::kNoError;
}
if (height < 0) {
@@ -2630,8 +2627,8 @@
"height < 0");
return error::kNoError;
}
- DoRenderbufferStorageMultisampleCHROMIUM(
- target, samples, internalformat, width, height);
+ DoRenderbufferStorageMultisampleCHROMIUM(target, samples, internalformat,
+ width, height);
return error::kNoError;
}
@@ -2655,33 +2652,32 @@
GLsizei width = static_cast<GLsizei>(c.width);
GLsizei height = static_cast<GLsizei>(c.height);
if (!validators_->render_buffer_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glRenderbufferStorageMultisampleEXT", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glRenderbufferStorageMultisampleEXT",
+ target, "target");
return error::kNoError;
}
if (samples < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT", "samples < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT",
+ "samples < 0");
return error::kNoError;
}
if (!validators_->render_buffer_format.IsValid(internalformat)) {
LOCAL_SET_GL_ERROR_INVALID_ENUM("glRenderbufferStorageMultisampleEXT",
- internalformat,
- "internalformat");
+ internalformat, "internalformat");
return error::kNoError;
}
if (width < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT", "width < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT",
+ "width < 0");
return error::kNoError;
}
if (height < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT", "height < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT",
+ "height < 0");
return error::kNoError;
}
- DoRenderbufferStorageMultisampleEXT(
- target, samples, internalformat, width, height);
+ DoRenderbufferStorageMultisampleEXT(target, samples, internalformat, width,
+ height);
return error::kNoError;
}
@@ -2706,28 +2702,27 @@
GLint level = static_cast<GLint>(c.level);
GLsizei samples = static_cast<GLsizei>(c.samples);
if (!validators_->frame_buffer_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferTexture2DMultisampleEXT", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferTexture2DMultisampleEXT",
+ target, "target");
return error::kNoError;
}
if (!validators_->attachment.IsValid(attachment)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferTexture2DMultisampleEXT", attachment, "attachment");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferTexture2DMultisampleEXT",
+ attachment, "attachment");
return error::kNoError;
}
if (!validators_->texture_target.IsValid(textarget)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glFramebufferTexture2DMultisampleEXT", textarget, "textarget");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glFramebufferTexture2DMultisampleEXT",
+ textarget, "textarget");
return error::kNoError;
}
if (samples < 0) {
- LOCAL_SET_GL_ERROR(GL_INVALID_VALUE,
- "glFramebufferTexture2DMultisampleEXT",
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glFramebufferTexture2DMultisampleEXT",
"samples < 0");
return error::kNoError;
}
- DoFramebufferTexture2DMultisample(
- target, attachment, textarget, texture, level, samples);
+ DoFramebufferTexture2DMultisample(target, attachment, textarget, texture,
+ level, samples);
return error::kNoError;
}
@@ -2751,8 +2746,8 @@
return error::kNoError;
}
if (!validators_->texture_internal_format_storage.IsValid(internalFormat)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glTexStorage2DEXT", internalFormat, "internalFormat");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glTexStorage2DEXT", internalFormat,
+ "internalFormat");
return error::kNoError;
}
if (width < 0) {
@@ -2956,13 +2951,13 @@
return error::kOutOfBounds;
}
if (count < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glGetMaxValueInBufferCHROMIUM", "count < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glGetMaxValueInBufferCHROMIUM",
+ "count < 0");
return error::kNoError;
}
if (!validators_->get_max_index_type.IsValid(type)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glGetMaxValueInBufferCHROMIUM", type, "type");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glGetMaxValueInBufferCHROMIUM", type,
+ "type");
return error::kNoError;
}
*result_dst = DoGetMaxValueInBufferCHROMIUM(buffer_id, count, type, offset);
@@ -2981,18 +2976,18 @@
GLuint ioSurfaceId = static_cast<GLuint>(c.ioSurfaceId);
GLuint plane = static_cast<GLuint>(c.plane);
if (!validators_->texture_bind_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glTexImageIOSurface2DCHROMIUM", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glTexImageIOSurface2DCHROMIUM", target,
+ "target");
return error::kNoError;
}
if (width < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glTexImageIOSurface2DCHROMIUM", "width < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glTexImageIOSurface2DCHROMIUM",
+ "width < 0");
return error::kNoError;
}
if (height < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glTexImageIOSurface2DCHROMIUM", "height < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glTexImageIOSurface2DCHROMIUM",
+ "height < 0");
return error::kNoError;
}
DoTexImageIOSurface2DCHROMIUM(target, width, height, ioSurfaceId, plane);
@@ -3012,18 +3007,17 @@
GLint internalformat = static_cast<GLint>(c.internalformat);
GLenum dest_type = static_cast<GLenum>(c.dest_type);
if (!validators_->texture_internal_format.IsValid(internalformat)) {
- LOCAL_SET_GL_ERROR(GL_INVALID_VALUE,
- "glCopyTextureCHROMIUM",
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCopyTextureCHROMIUM",
"internalformat GL_INVALID_VALUE");
return error::kNoError;
}
if (!validators_->pixel_type.IsValid(dest_type)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glCopyTextureCHROMIUM", dest_type, "dest_type");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glCopyTextureCHROMIUM", dest_type,
+ "dest_type");
return error::kNoError;
}
- DoCopyTextureCHROMIUM(
- target, source_id, dest_id, level, internalformat, dest_type);
+ DoCopyTextureCHROMIUM(target, source_id, dest_id, level, internalformat,
+ dest_type);
return error::kNoError;
}
@@ -3045,8 +3039,8 @@
const GLbyte* mailbox =
GetImmediateDataAs<const GLbyte*>(c, data_size, immediate_data_size);
if (!validators_->texture_bind_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glProduceTextureCHROMIUM", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glProduceTextureCHROMIUM", target,
+ "target");
return error::kNoError;
}
if (mailbox == NULL) {
@@ -3075,8 +3069,8 @@
const GLbyte* mailbox =
GetImmediateDataAs<const GLbyte*>(c, data_size, immediate_data_size);
if (!validators_->texture_bind_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glProduceTextureDirectCHROMIUM", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glProduceTextureDirectCHROMIUM", target,
+ "target");
return error::kNoError;
}
if (mailbox == NULL) {
@@ -3104,8 +3098,8 @@
const GLbyte* mailbox =
GetImmediateDataAs<const GLbyte*>(c, data_size, immediate_data_size);
if (!validators_->texture_bind_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glConsumeTextureCHROMIUM", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glConsumeTextureCHROMIUM", target,
+ "target");
return error::kNoError;
}
if (mailbox == NULL) {
@@ -3124,8 +3118,8 @@
GLenum target = static_cast<GLenum>(c.target);
GLint imageId = static_cast<GLint>(c.imageId);
if (!validators_->texture_bind_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glBindTexImage2DCHROMIUM", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glBindTexImage2DCHROMIUM", target,
+ "target");
return error::kNoError;
}
DoBindTexImage2DCHROMIUM(target, imageId);
@@ -3141,8 +3135,8 @@
GLenum target = static_cast<GLenum>(c.target);
GLint imageId = static_cast<GLint>(c.imageId);
if (!validators_->texture_bind_target.IsValid(target)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glReleaseTexImage2DCHROMIUM", target, "target");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glReleaseTexImage2DCHROMIUM", target,
+ "target");
return error::kNoError;
}
DoReleaseTexImage2DCHROMIUM(target, imageId);
@@ -3167,8 +3161,7 @@
cmd_data);
(void)c;
if (!features().ext_discard_framebuffer) {
- LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
- "glDiscardFramebufferEXT",
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glDiscardFramebufferEXT",
"function not available");
return error::kNoError;
}
@@ -3185,8 +3178,8 @@
const GLenum* attachments =
GetImmediateDataAs<const GLenum*>(c, data_size, immediate_data_size);
if (count < 0) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_VALUE, "glDiscardFramebufferEXT", "count < 0");
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glDiscardFramebufferEXT",
+ "count < 0");
return error::kNoError;
}
if (attachments == NULL) {
@@ -3205,8 +3198,8 @@
GLenum current = static_cast<GLenum>(c.current);
GLenum other = static_cast<GLenum>(c.other);
if (!validators_->reset_status.IsValid(current)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glLoseContextCHROMIUM", current, "current");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glLoseContextCHROMIUM", current,
+ "current");
return error::kNoError;
}
if (!validators_->reset_status.IsValid(other)) {
@@ -3251,8 +3244,7 @@
*static_cast<const gles2::cmds::MatrixLoadfCHROMIUMImmediate*>(cmd_data);
(void)c;
if (!features().chromium_path_rendering) {
- LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
- "glMatrixLoadfCHROMIUM",
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glMatrixLoadfCHROMIUM",
"function not available");
return error::kNoError;
}
@@ -3268,8 +3260,8 @@
const GLfloat* m =
GetImmediateDataAs<const GLfloat*>(c, data_size, immediate_data_size);
if (!validators_->matrix_mode.IsValid(matrixMode)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glMatrixLoadfCHROMIUM", matrixMode, "matrixMode");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glMatrixLoadfCHROMIUM", matrixMode,
+ "matrixMode");
return error::kNoError;
}
if (m == NULL) {
@@ -3286,16 +3278,15 @@
*static_cast<const gles2::cmds::MatrixLoadIdentityCHROMIUM*>(cmd_data);
(void)c;
if (!features().chromium_path_rendering) {
- LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
- "glMatrixLoadIdentityCHROMIUM",
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glMatrixLoadIdentityCHROMIUM",
"function not available");
return error::kNoError;
}
GLenum matrixMode = static_cast<GLenum>(c.matrixMode);
if (!validators_->matrix_mode.IsValid(matrixMode)) {
- LOCAL_SET_GL_ERROR_INVALID_ENUM(
- "glMatrixLoadIdentityCHROMIUM", matrixMode, "matrixMode");
+ LOCAL_SET_GL_ERROR_INVALID_ENUM("glMatrixLoadIdentityCHROMIUM", matrixMode,
+ "matrixMode");
return error::kNoError;
}
DoMatrixLoadIdentityCHROMIUM(matrixMode);
@@ -3309,8 +3300,8 @@
*static_cast<const gles2::cmds::BlendBarrierKHR*>(cmd_data);
(void)c;
if (!features().blend_equation_advanced) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_OPERATION, "glBlendBarrierKHR", "function not available");
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glBlendBarrierKHR",
+ "function not available");
return error::kNoError;
}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
index b60bd3e..6fe923c 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
@@ -662,16 +662,12 @@
}
TEST_P(GLES2DecoderTest1, FramebufferRenderbufferValidArgs) {
- EXPECT_CALL(*gl_,
- FramebufferRenderbufferEXT(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_RENDERBUFFER,
- kServiceRenderbufferId));
+ EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
+ GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
+ kServiceRenderbufferId));
SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(true);
cmds::FramebufferRenderbuffer cmd;
- cmd.Init(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_RENDERBUFFER,
+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
client_renderbuffer_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -681,9 +677,7 @@
EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);
SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);
cmds::FramebufferRenderbuffer cmd;
- cmd.Init(GL_DRAW_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_RENDERBUFFER,
+ cmd.Init(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
client_renderbuffer_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
@@ -693,9 +687,7 @@
EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);
SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);
cmds::FramebufferRenderbuffer cmd;
- cmd.Init(GL_READ_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_RENDERBUFFER,
+ cmd.Init(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
client_renderbuffer_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
@@ -705,9 +697,7 @@
EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);
SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);
cmds::FramebufferRenderbuffer cmd;
- cmd.Init(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER,
+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER,
client_renderbuffer_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
@@ -715,15 +705,12 @@
TEST_P(GLES2DecoderTest1, FramebufferTexture2DValidArgs) {
EXPECT_CALL(*gl_,
- FramebufferTexture2DEXT(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_TEXTURE_2D,
- kServiceTextureId,
- 0));
+ FramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_TEXTURE_2D, kServiceTextureId, 0));
SpecializedSetup<cmds::FramebufferTexture2D, 0>(true);
cmds::FramebufferTexture2D cmd;
- cmd.Init(
- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, client_texture_id_);
+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+ client_texture_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -732,9 +719,7 @@
EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);
SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);
cmds::FramebufferTexture2D cmd;
- cmd.Init(GL_DRAW_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_TEXTURE_2D,
+ cmd.Init(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
client_texture_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
@@ -744,9 +729,7 @@
EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);
SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);
cmds::FramebufferTexture2D cmd;
- cmd.Init(GL_READ_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_TEXTURE_2D,
+ cmd.Init(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
client_texture_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
@@ -756,9 +739,7 @@
EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);
SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);
cmds::FramebufferTexture2D cmd;
- cmd.Init(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_PROXY_TEXTURE_CUBE_MAP,
+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_PROXY_TEXTURE_CUBE_MAP,
client_texture_id_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
@@ -958,9 +939,7 @@
Result* result = static_cast<Result*>(shared_memory_address_);
result->size = 0;
cmds::GetBufferParameteriv cmd;
- cmd.Init(GL_ARRAY_BUFFER,
- GL_BUFFER_SIZE,
- shared_memory_id_,
+ cmd.Init(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_BUFFER_SIZE),
@@ -975,9 +954,7 @@
static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetBufferParameteriv cmd;
- cmd.Init(GL_RENDERBUFFER,
- GL_BUFFER_SIZE,
- shared_memory_id_,
+ cmd.Init(GL_RENDERBUFFER, GL_BUFFER_SIZE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -991,9 +968,7 @@
static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetBufferParameteriv cmd;
- cmd.Init(GL_ARRAY_BUFFER,
- GL_PIXEL_PACK_BUFFER,
- shared_memory_id_,
+ cmd.Init(GL_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1019,9 +994,7 @@
static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetBufferParameteriv cmd;
- cmd.Init(GL_ARRAY_BUFFER,
- GL_BUFFER_SIZE,
- shared_memory_id_,
+ cmd.Init(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1111,16 +1084,12 @@
Result* result = static_cast<Result*>(shared_memory_address_);
EXPECT_CALL(*gl_,
GetFramebufferAttachmentParameterivEXT(
- GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
- result->GetData()));
+ GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, result->GetData()));
result->size = 0;
cmds::GetFramebufferAttachmentParameteriv cmd;
- cmd.Init(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
- shared_memory_id_,
+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
@@ -1138,10 +1107,8 @@
shared_memory_address_);
result->size = 0;
cmds::GetFramebufferAttachmentParameteriv cmd;
- cmd.Init(GL_DRAW_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
- shared_memory_id_,
+ cmd.Init(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1157,10 +1124,8 @@
shared_memory_address_);
result->size = 0;
cmds::GetFramebufferAttachmentParameteriv cmd;
- cmd.Init(GL_READ_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
- shared_memory_id_,
+ cmd.Init(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1176,11 +1141,8 @@
shared_memory_address_);
result->size = 0;
cmds::GetFramebufferAttachmentParameteriv cmd;
- cmd.Init(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
- kInvalidSharedMemoryId,
- 0);
+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
}
@@ -1194,10 +1156,8 @@
shared_memory_address_);
result->size = 0;
cmds::GetFramebufferAttachmentParameteriv cmd;
- cmd.Init(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
- shared_memory_id_,
+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1264,9 +1224,7 @@
Result* result = static_cast<Result*>(shared_memory_address_);
result->size = 0;
cmds::GetProgramiv cmd;
- cmd.Init(client_program_id_,
- GL_DELETE_STATUS,
- shared_memory_id_,
+ cmd.Init(client_program_id_, GL_DELETE_STATUS, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_DELETE_STATUS),
@@ -1293,9 +1251,7 @@
static_cast<cmds::GetProgramiv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetProgramiv cmd;
- cmd.Init(client_program_id_,
- GL_DELETE_STATUS,
- shared_memory_id_,
+ cmd.Init(client_program_id_, GL_DELETE_STATUS, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1334,14 +1290,11 @@
typedef cmds::GetRenderbufferParameteriv::Result Result;
Result* result = static_cast<Result*>(shared_memory_address_);
EXPECT_CALL(
- *gl_,
- GetRenderbufferParameterivEXT(
- GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, result->GetData()));
+ *gl_, GetRenderbufferParameterivEXT(
+ GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, result->GetData()));
result->size = 0;
cmds::GetRenderbufferParameteriv cmd;
- cmd.Init(GL_RENDERBUFFER,
- GL_RENDERBUFFER_RED_SIZE,
- shared_memory_id_,
+ cmd.Init(GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
@@ -1358,9 +1311,7 @@
shared_memory_address_);
result->size = 0;
cmds::GetRenderbufferParameteriv cmd;
- cmd.Init(GL_FRAMEBUFFER,
- GL_RENDERBUFFER_RED_SIZE,
- shared_memory_id_,
+ cmd.Init(GL_FRAMEBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1375,8 +1326,8 @@
shared_memory_address_);
result->size = 0;
cmds::GetRenderbufferParameteriv cmd;
- cmd.Init(
- GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, kInvalidSharedMemoryId, 0);
+ cmd.Init(GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, kInvalidSharedMemoryId,
+ 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
}
@@ -1389,9 +1340,7 @@
shared_memory_address_);
result->size = 0;
cmds::GetRenderbufferParameteriv cmd;
- cmd.Init(GL_RENDERBUFFER,
- GL_RENDERBUFFER_RED_SIZE,
- shared_memory_id_,
+ cmd.Init(GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1409,9 +1358,7 @@
GetShaderiv(kServiceShaderId, GL_SHADER_TYPE, result->GetData()));
result->size = 0;
cmds::GetShaderiv cmd;
- cmd.Init(client_shader_id_,
- GL_SHADER_TYPE,
- shared_memory_id_,
+ cmd.Init(client_shader_id_, GL_SHADER_TYPE, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_SHADER_TYPE),
@@ -1438,9 +1385,7 @@
static_cast<cmds::GetShaderiv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetShaderiv cmd;
- cmd.Init(client_shader_id_,
- GL_SHADER_TYPE,
- shared_memory_id_,
+ cmd.Init(client_shader_id_, GL_SHADER_TYPE, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1459,14 +1404,11 @@
SpecializedSetup<cmds::GetTexParameterfv, 0>(true);
typedef cmds::GetTexParameterfv::Result Result;
Result* result = static_cast<Result*>(shared_memory_address_);
- EXPECT_CALL(*gl_,
- GetTexParameterfv(
- GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, result->GetData()));
+ EXPECT_CALL(*gl_, GetTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+ result->GetData()));
result->size = 0;
cmds::GetTexParameterfv cmd;
- cmd.Init(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
- shared_memory_id_,
+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(
@@ -1482,9 +1424,7 @@
static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetTexParameterfv cmd;
- cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP,
- GL_TEXTURE_MAG_FILTER,
- shared_memory_id_,
+ cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1498,9 +1438,7 @@
static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetTexParameterfv cmd;
- cmd.Init(GL_TEXTURE_2D,
- GL_GENERATE_MIPMAP,
- shared_memory_id_,
+ cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1526,9 +1464,7 @@
static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetTexParameterfv cmd;
- cmd.Init(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
- shared_memory_id_,
+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1542,14 +1478,11 @@
SpecializedSetup<cmds::GetTexParameteriv, 0>(true);
typedef cmds::GetTexParameteriv::Result Result;
Result* result = static_cast<Result*>(shared_memory_address_);
- EXPECT_CALL(*gl_,
- GetTexParameteriv(
- GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, result->GetData()));
+ EXPECT_CALL(*gl_, GetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+ result->GetData()));
result->size = 0;
cmds::GetTexParameteriv cmd;
- cmd.Init(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
- shared_memory_id_,
+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(
@@ -1565,9 +1498,7 @@
static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetTexParameteriv cmd;
- cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP,
- GL_TEXTURE_MAG_FILTER,
- shared_memory_id_,
+ cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1581,9 +1512,7 @@
static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetTexParameteriv cmd;
- cmd.Init(GL_TEXTURE_2D,
- GL_GENERATE_MIPMAP,
- shared_memory_id_,
+ cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1609,9 +1538,7 @@
static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetTexParameteriv cmd;
- cmd.Init(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
- shared_memory_id_,
+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1628,9 +1555,7 @@
Result* result = static_cast<Result*>(shared_memory_address_);
result->size = 0;
cmds::GetVertexAttribfv cmd;
- cmd.Init(1,
- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,
- shared_memory_id_,
+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
@@ -1658,9 +1583,7 @@
static_cast<cmds::GetVertexAttribfv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetVertexAttribfv cmd;
- cmd.Init(1,
- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,
- shared_memory_id_,
+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1672,9 +1595,7 @@
Result* result = static_cast<Result*>(shared_memory_address_);
result->size = 0;
cmds::GetVertexAttribiv cmd;
- cmd.Init(1,
- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,
- shared_memory_id_,
+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
@@ -1702,9 +1623,7 @@
static_cast<cmds::GetVertexAttribiv::Result*>(shared_memory_address_);
result->size = 0;
cmds::GetVertexAttribiv cmd;
- cmd.Init(1,
- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,
- shared_memory_id_,
+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(0u, result->size);
@@ -1792,11 +1711,11 @@
TEST_P(GLES2DecoderTest1, IsFramebufferInvalidArgsBadSharedMemoryId) {
SpecializedSetup<cmds::IsFramebuffer, 0>(false);
cmds::IsFramebuffer cmd;
- cmd.Init(
- client_framebuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);
+ cmd.Init(client_framebuffer_id_, kInvalidSharedMemoryId,
+ shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
- cmd.Init(
- client_framebuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(client_framebuffer_id_, shared_memory_id_,
+ kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1828,11 +1747,11 @@
TEST_P(GLES2DecoderTest1, IsRenderbufferInvalidArgsBadSharedMemoryId) {
SpecializedSetup<cmds::IsRenderbuffer, 0>(false);
cmds::IsRenderbuffer cmd;
- cmd.Init(
- client_renderbuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);
+ cmd.Init(client_renderbuffer_id_, kInvalidSharedMemoryId,
+ shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
- cmd.Init(
- client_renderbuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(client_renderbuffer_id_, shared_memory_id_,
+ kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
index 95c2027..b29b243 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
@@ -142,8 +142,7 @@
cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &temp[0]);
EXPECT_CALL(
*gl_,
- TexParameterf(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
+ TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
*reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -233,11 +232,9 @@
GL_NEAREST,
};
cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &temp[0]);
- EXPECT_CALL(
- *gl_,
- TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
- *reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_, TexParameteri(
+ GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+ *reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -448,10 +445,9 @@
TEST_P(GLES2DecoderTest2, UniformMatrix2fvImmediateValidArgs) {
cmds::UniformMatrix2fvImmediate& cmd =
*GetImmediateAs<cmds::UniformMatrix2fvImmediate>();
- EXPECT_CALL(
- *gl_,
- UniformMatrix2fv(
- 1, 2, false, reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_,
+ UniformMatrix2fv(1, 2, false, reinterpret_cast<GLfloat*>(
+ ImmediateDataAddress(&cmd))));
SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>(true);
GLfloat temp[4 * 2] = {
0,
@@ -464,10 +460,9 @@
TEST_P(GLES2DecoderTest2, UniformMatrix3fvImmediateValidArgs) {
cmds::UniformMatrix3fvImmediate& cmd =
*GetImmediateAs<cmds::UniformMatrix3fvImmediate>();
- EXPECT_CALL(
- *gl_,
- UniformMatrix3fv(
- 1, 2, false, reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_,
+ UniformMatrix3fv(1, 2, false, reinterpret_cast<GLfloat*>(
+ ImmediateDataAddress(&cmd))));
SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>(true);
GLfloat temp[9 * 2] = {
0,
@@ -480,10 +475,9 @@
TEST_P(GLES2DecoderTest2, UniformMatrix4fvImmediateValidArgs) {
cmds::UniformMatrix4fvImmediate& cmd =
*GetImmediateAs<cmds::UniformMatrix4fvImmediate>();
- EXPECT_CALL(
- *gl_,
- UniformMatrix4fv(
- 1, 2, false, reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_,
+ UniformMatrix4fv(1, 2, false, reinterpret_cast<GLfloat*>(
+ ImmediateDataAddress(&cmd))));
SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>(true);
GLfloat temp[16 * 2] = {
0,
@@ -537,9 +531,8 @@
0,
};
cmd.Init(1, &temp[0]);
- EXPECT_CALL(*gl_,
- VertexAttrib1fv(
- 1, reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_, VertexAttrib1fv(1, reinterpret_cast<GLfloat*>(
+ ImmediateDataAddress(&cmd))));
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -561,9 +554,8 @@
0,
};
cmd.Init(1, &temp[0]);
- EXPECT_CALL(*gl_,
- VertexAttrib2fv(
- 1, reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_, VertexAttrib2fv(1, reinterpret_cast<GLfloat*>(
+ ImmediateDataAddress(&cmd))));
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -585,9 +577,8 @@
0,
};
cmd.Init(1, &temp[0]);
- EXPECT_CALL(*gl_,
- VertexAttrib3fv(
- 1, reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_, VertexAttrib3fv(1, reinterpret_cast<GLfloat*>(
+ ImmediateDataAddress(&cmd))));
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -609,9 +600,8 @@
0,
};
cmd.Init(1, &temp[0]);
- EXPECT_CALL(*gl_,
- VertexAttrib4fv(
- 1, reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
+ EXPECT_CALL(*gl_, VertexAttrib4fv(1, reinterpret_cast<GLfloat*>(
+ ImmediateDataAddress(&cmd))));
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc
index 015d808..058a546 100644
--- a/gpu/command_buffer/service/gpu_scheduler.cc
+++ b/gpu/command_buffer/service/gpu_scheduler.cc
@@ -51,11 +51,11 @@
// If there is no parser, exit.
if (!parser_.get()) {
- DCHECK_EQ(state.get_offset, state.put_offset);
+ DCHECK_EQ(state.get_offset, command_buffer_->GetPutOffset());
return;
}
- parser_->set_put(state.put_offset);
+ parser_->set_put(command_buffer_->GetPutOffset());
if (state.error != error::kNoError)
return;
diff --git a/gpu/command_buffer/service/gpu_scheduler_unittest.cc b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
index d8233ec..c1c0d1c 100644
--- a/gpu/command_buffer/service/gpu_scheduler_unittest.cc
+++ b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
@@ -26,7 +26,6 @@
namespace gpu {
const size_t kRingBufferSize = 1024;
-const size_t kRingBufferEntries = kRingBufferSize / sizeof(CommandBufferEntry);
class GpuSchedulerTest : public testing::Test {
protected:
@@ -43,9 +42,10 @@
command_buffer_.reset(new MockCommandBuffer);
CommandBuffer::State default_state;
- default_state.num_entries = kRingBufferEntries;
ON_CALL(*command_buffer_.get(), GetLastState())
.WillByDefault(Return(default_state));
+ ON_CALL(*command_buffer_.get(), GetPutOffset())
+ .WillByDefault(Return(0));
decoder_.reset(new gles2::MockGLES2Decoder());
// Install FakeDoCommands handler so we can use individual DoCommand()
@@ -86,7 +86,6 @@
TEST_F(GpuSchedulerTest, SchedulerDoesNothingIfRingBufferIsEmpty) {
CommandBuffer::State state;
- state.put_offset = 0;
EXPECT_CALL(*command_buffer_, GetLastState())
.WillRepeatedly(Return(state));
@@ -122,9 +121,10 @@
CommandBuffer::State state;
- state.put_offset = 2;
EXPECT_CALL(*command_buffer_, GetLastState())
.WillRepeatedly(Return(state));
+ EXPECT_CALL(*command_buffer_, GetPutOffset())
+ .WillRepeatedly(Return(2));
EXPECT_CALL(*command_buffer_, SetGetOffset(2));
EXPECT_CALL(*decoder_, DoCommand(7, 1, &buffer_[0]))
@@ -146,9 +146,10 @@
CommandBuffer::State state;
- state.put_offset = 3;
EXPECT_CALL(*command_buffer_, GetLastState())
.WillRepeatedly(Return(state));
+ EXPECT_CALL(*command_buffer_, GetPutOffset())
+ .WillRepeatedly(Return(3));
EXPECT_CALL(*decoder_, DoCommand(7, 1, &buffer_[0]))
.WillOnce(Return(error::kNoError));
@@ -167,9 +168,10 @@
CommandBuffer::State state;
- state.put_offset = 1;
EXPECT_CALL(*command_buffer_, GetLastState())
.WillRepeatedly(Return(state));
+ EXPECT_CALL(*command_buffer_, GetPutOffset())
+ .WillRepeatedly(Return(1));
EXPECT_CALL(*decoder_, DoCommand(7, 0, &buffer_[0]))
.WillOnce(Return(
diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc
index db482a9..46395fb 100644
--- a/gpu/ipc/gpu_command_buffer_traits.cc
+++ b/gpu/ipc/gpu_command_buffer_traits.cc
@@ -9,9 +9,7 @@
void ParamTraits<gpu::CommandBuffer::State> ::Write(Message* m,
const param_type& p) {
- WriteParam(m, p.num_entries);
WriteParam(m, p.get_offset);
- WriteParam(m, p.put_offset);
WriteParam(m, p.token);
WriteParam(m, static_cast<int32>(p.error));
WriteParam(m, p.generation);
@@ -21,9 +19,7 @@
PickleIterator* iter,
param_type* p) {
int32 temp;
- if (ReadParam(m, iter, &p->num_entries) &&
- ReadParam(m, iter, &p->get_offset) &&
- ReadParam(m, iter, &p->put_offset) &&
+ if (ReadParam(m, iter, &p->get_offset) &&
ReadParam(m, iter, &p->token) &&
ReadParam(m, iter, &temp) &&
ReadParam(m, iter, &p->generation)) {
