| Index: gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
|
| 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 a44c7064f2e8d6d0c849e25dae0915aae96c5fb9..7dacd2ff73cad20c7b4d5ee82b1d4d0bc33b14ad 100644
|
| --- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
|
| +++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
|
| @@ -4159,21 +4159,23 @@ TEST_F(GLES2FormatTest, PostSubBufferCHROMIUM) {
|
|
|
| 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<GLint>(13), static_cast<GLenum>(14),
|
| - static_cast<GLboolean>(15), static_cast<GLboolean>(16),
|
| - static_cast<GLboolean>(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<GLenum>(16), static_cast<GLboolean>(17),
|
| + static_cast<GLboolean>(18), static_cast<GLboolean>(19));
|
| EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTextureCHROMIUM::kCmdId),
|
| cmd.header.command);
|
| EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
|
| EXPECT_EQ(static_cast<GLenum>(11), cmd.source_id);
|
| - EXPECT_EQ(static_cast<GLenum>(12), cmd.dest_id);
|
| - EXPECT_EQ(static_cast<GLint>(13), cmd.internalformat);
|
| - EXPECT_EQ(static_cast<GLenum>(14), cmd.dest_type);
|
| - EXPECT_EQ(static_cast<GLboolean>(15), cmd.unpack_flip_y);
|
| - EXPECT_EQ(static_cast<GLboolean>(16), cmd.unpack_premultiply_alpha);
|
| - EXPECT_EQ(static_cast<GLboolean>(17), cmd.unpack_unmultiply_alpha);
|
| + EXPECT_EQ(static_cast<GLint>(12), cmd.source_level);
|
| + EXPECT_EQ(static_cast<GLenum>(13), cmd.dest_id);
|
| + EXPECT_EQ(static_cast<GLint>(14), cmd.dest_level);
|
| + EXPECT_EQ(static_cast<GLint>(15), cmd.internalformat);
|
| + EXPECT_EQ(static_cast<GLenum>(16), cmd.dest_type);
|
| + EXPECT_EQ(static_cast<GLboolean>(17), cmd.unpack_flip_y);
|
| + EXPECT_EQ(static_cast<GLboolean>(18), cmd.unpack_premultiply_alpha);
|
| + EXPECT_EQ(static_cast<GLboolean>(19), cmd.unpack_unmultiply_alpha);
|
| CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
|
| }
|
|
|
| @@ -4181,25 +4183,28 @@ TEST_F(GLES2FormatTest, CopySubTextureCHROMIUM) {
|
| cmds::CopySubTextureCHROMIUM& cmd =
|
| *GetBufferAs<cmds::CopySubTextureCHROMIUM>();
|
| void* next_cmd = cmd.Set(
|
| - &cmd, static_cast<GLenum>(11), static_cast<GLenum>(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), static_cast<GLboolean>(19),
|
| - static_cast<GLboolean>(20), static_cast<GLboolean>(21));
|
| + &cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
|
| + static_cast<GLenum>(13), static_cast<GLint>(14), static_cast<GLint>(15),
|
| + static_cast<GLint>(16), static_cast<GLint>(17), static_cast<GLint>(18),
|
| + static_cast<GLsizei>(19), static_cast<GLsizei>(20),
|
| + static_cast<GLboolean>(21), static_cast<GLboolean>(22),
|
| + static_cast<GLboolean>(23));
|
| EXPECT_EQ(static_cast<uint32_t>(cmds::CopySubTextureCHROMIUM::kCmdId),
|
| cmd.header.command);
|
| EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
|
| EXPECT_EQ(static_cast<GLenum>(11), cmd.source_id);
|
| - EXPECT_EQ(static_cast<GLenum>(12), cmd.dest_id);
|
| - EXPECT_EQ(static_cast<GLint>(13), cmd.xoffset);
|
| - EXPECT_EQ(static_cast<GLint>(14), cmd.yoffset);
|
| - EXPECT_EQ(static_cast<GLint>(15), cmd.x);
|
| - EXPECT_EQ(static_cast<GLint>(16), cmd.y);
|
| - EXPECT_EQ(static_cast<GLsizei>(17), cmd.width);
|
| - EXPECT_EQ(static_cast<GLsizei>(18), cmd.height);
|
| - EXPECT_EQ(static_cast<GLboolean>(19), cmd.unpack_flip_y);
|
| - EXPECT_EQ(static_cast<GLboolean>(20), cmd.unpack_premultiply_alpha);
|
| - EXPECT_EQ(static_cast<GLboolean>(21), cmd.unpack_unmultiply_alpha);
|
| + EXPECT_EQ(static_cast<GLint>(12), cmd.source_level);
|
| + EXPECT_EQ(static_cast<GLenum>(13), cmd.dest_id);
|
| + EXPECT_EQ(static_cast<GLint>(14), cmd.dest_level);
|
| + EXPECT_EQ(static_cast<GLint>(15), cmd.xoffset);
|
| + EXPECT_EQ(static_cast<GLint>(16), cmd.yoffset);
|
| + EXPECT_EQ(static_cast<GLint>(17), cmd.x);
|
| + EXPECT_EQ(static_cast<GLint>(18), cmd.y);
|
| + EXPECT_EQ(static_cast<GLsizei>(19), cmd.width);
|
| + EXPECT_EQ(static_cast<GLsizei>(20), cmd.height);
|
| + EXPECT_EQ(static_cast<GLboolean>(21), cmd.unpack_flip_y);
|
| + EXPECT_EQ(static_cast<GLboolean>(22), cmd.unpack_premultiply_alpha);
|
| + EXPECT_EQ(static_cast<GLboolean>(23), cmd.unpack_unmultiply_alpha);
|
| CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
|
| }
|
|
|
|
|