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

Unified Diff: gpu/command_buffer/common/gles2_cmd_format_test_autogen.h

Issue 1551143002: Remove the "target" argument from CopyTextureChromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error. Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8b9c540fb9934da8f6881cd193cd637e3ec28bb1..f8ebe0f66829e85618c79d0ef21c64ff64d0dfee 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -4143,20 +4143,19 @@ 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<GLenum>(15), static_cast<GLboolean>(16),
- static_cast<GLboolean>(17), static_cast<GLboolean>(18));
+ static_cast<GLint>(13), static_cast<GLenum>(14),
+ static_cast<GLboolean>(15), static_cast<GLboolean>(16),
+ static_cast<GLboolean>(17));
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.target);
- EXPECT_EQ(static_cast<GLenum>(12), cmd.source_id);
- EXPECT_EQ(static_cast<GLenum>(13), cmd.dest_id);
- EXPECT_EQ(static_cast<GLint>(14), cmd.internalformat);
- EXPECT_EQ(static_cast<GLenum>(15), cmd.dest_type);
- EXPECT_EQ(static_cast<GLboolean>(16), cmd.unpack_flip_y);
- EXPECT_EQ(static_cast<GLboolean>(17), cmd.unpack_premultiply_alpha);
- EXPECT_EQ(static_cast<GLboolean>(18), cmd.unpack_unmultiply_alpha);
+ 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);
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
@@ -4165,25 +4164,24 @@ TEST_F(GLES2FormatTest, CopySubTextureCHROMIUM) {
*GetBufferAs<cmds::CopySubTextureCHROMIUM>();
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<GLint>(16), static_cast<GLint>(17), static_cast<GLsizei>(18),
- static_cast<GLsizei>(19), static_cast<GLboolean>(20),
- static_cast<GLboolean>(21), static_cast<GLboolean>(22));
+ 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));
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.target);
- EXPECT_EQ(static_cast<GLenum>(12), cmd.source_id);
- EXPECT_EQ(static_cast<GLenum>(13), cmd.dest_id);
- EXPECT_EQ(static_cast<GLint>(14), cmd.xoffset);
- EXPECT_EQ(static_cast<GLint>(15), cmd.yoffset);
- EXPECT_EQ(static_cast<GLint>(16), cmd.x);
- EXPECT_EQ(static_cast<GLint>(17), cmd.y);
- EXPECT_EQ(static_cast<GLsizei>(18), cmd.width);
- EXPECT_EQ(static_cast<GLsizei>(19), cmd.height);
- EXPECT_EQ(static_cast<GLboolean>(20), cmd.unpack_flip_y);
- EXPECT_EQ(static_cast<GLboolean>(21), cmd.unpack_premultiply_alpha);
- EXPECT_EQ(static_cast<GLboolean>(22), cmd.unpack_unmultiply_alpha);
+ 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);
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_format_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698