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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 282253002: Remove unneeded shm versions of bucket functions from command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-shm-for-immediate-commands
Patch Set: rebase (1 new added hunk) Created 6 years, 6 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
« gpu/command_buffer/build_gles2_cmd_buffer.py ('K') | « gpu/command_buffer/common/gles2_cmd_format_autogen.h ('k') | gpu/command_buffer/common/gles2_cmd_ids_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6df22957dc106727040e30bc206b3065b6324a4b..071bde21a6eccb99e29a14c01538f45f450f38d5 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -36,25 +36,6 @@ TEST_F(GLES2FormatTest, AttachShader) {
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
-TEST_F(GLES2FormatTest, BindAttribLocation) {
- cmds::BindAttribLocation& cmd = *GetBufferAs<cmds::BindAttribLocation>();
- 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::BindAttribLocation::kCmdId),
- cmd.header.command);
- EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
- EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
- EXPECT_EQ(static_cast<GLuint>(12), cmd.index);
- EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_shm_id);
- EXPECT_EQ(static_cast<uint32_t>(14), cmd.name_shm_offset);
- EXPECT_EQ(static_cast<uint32_t>(15), cmd.data_size);
- CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
-}
-
TEST_F(GLES2FormatTest, BindAttribLocationBucket) {
cmds::BindAttribLocationBucket& cmd =
*GetBufferAs<cmds::BindAttribLocationBucket>();
@@ -313,18 +294,17 @@ TEST_F(GLES2FormatTest, CompileShader) {
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
-TEST_F(GLES2FormatTest, CompressedTexImage2D) {
- cmds::CompressedTexImage2D& cmd = *GetBufferAs<cmds::CompressedTexImage2D>();
+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<GLsizei>(16),
- static_cast<uint32_t>(17),
- static_cast<uint32_t>(18));
- EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2D::kCmdId),
+ static_cast<GLuint>(16));
+ EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2DBucket::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -332,23 +312,22 @@ TEST_F(GLES2FormatTest, CompressedTexImage2D) {
EXPECT_EQ(static_cast<GLenum>(13), cmd.internalformat);
EXPECT_EQ(static_cast<GLsizei>(14), cmd.width);
EXPECT_EQ(static_cast<GLsizei>(15), cmd.height);
- EXPECT_EQ(static_cast<GLsizei>(16), cmd.imageSize);
- EXPECT_EQ(static_cast<uint32_t>(17), cmd.data_shm_id);
- EXPECT_EQ(static_cast<uint32_t>(18), cmd.data_shm_offset);
+ EXPECT_EQ(static_cast<GLuint>(16), cmd.bucket_id);
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
-TEST_F(GLES2FormatTest, CompressedTexImage2DBucket) {
- cmds::CompressedTexImage2DBucket& cmd =
- *GetBufferAs<cmds::CompressedTexImage2DBucket>();
+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<GLuint>(16));
- EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2DBucket::kCmdId),
+ 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);
EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -356,13 +335,15 @@ TEST_F(GLES2FormatTest, CompressedTexImage2DBucket) {
EXPECT_EQ(static_cast<GLenum>(13), cmd.internalformat);
EXPECT_EQ(static_cast<GLsizei>(14), cmd.width);
EXPECT_EQ(static_cast<GLsizei>(15), cmd.height);
- EXPECT_EQ(static_cast<GLuint>(16), cmd.bucket_id);
+ EXPECT_EQ(static_cast<GLsizei>(16), cmd.imageSize);
+ EXPECT_EQ(static_cast<uint32_t>(17), cmd.data_shm_id);
+ EXPECT_EQ(static_cast<uint32_t>(18), cmd.data_shm_offset);
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
-TEST_F(GLES2FormatTest, CompressedTexSubImage2D) {
- cmds::CompressedTexSubImage2D& cmd =
- *GetBufferAs<cmds::CompressedTexSubImage2D>();
+TEST_F(GLES2FormatTest, CompressedTexSubImage2DBucket) {
+ cmds::CompressedTexSubImage2DBucket& cmd =
+ *GetBufferAs<cmds::CompressedTexSubImage2DBucket>();
void* next_cmd = cmd.Set(&cmd,
static_cast<GLenum>(11),
static_cast<GLint>(12),
@@ -371,10 +352,8 @@ TEST_F(GLES2FormatTest, CompressedTexSubImage2D) {
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),
+ static_cast<GLuint>(18));
+ EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexSubImage2DBucket::kCmdId),
cmd.header.command);
EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -384,15 +363,13 @@ TEST_F(GLES2FormatTest, CompressedTexSubImage2D) {
EXPECT_EQ(static_cast<GLsizei>(15), cmd.width);
EXPECT_EQ(static_cast<GLsizei>(16), cmd.height);
EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
- EXPECT_EQ(static_cast<GLsizei>(18), cmd.imageSize);
- EXPECT_EQ(static_cast<uint32_t>(19), cmd.data_shm_id);
- EXPECT_EQ(static_cast<uint32_t>(20), cmd.data_shm_offset);
+ EXPECT_EQ(static_cast<GLuint>(18), cmd.bucket_id);
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
-TEST_F(GLES2FormatTest, CompressedTexSubImage2DBucket) {
- cmds::CompressedTexSubImage2DBucket& cmd =
- *GetBufferAs<cmds::CompressedTexSubImage2DBucket>();
+TEST_F(GLES2FormatTest, CompressedTexSubImage2D) {
+ cmds::CompressedTexSubImage2D& cmd =
+ *GetBufferAs<cmds::CompressedTexSubImage2D>();
void* next_cmd = cmd.Set(&cmd,
static_cast<GLenum>(11),
static_cast<GLint>(12),
@@ -401,8 +378,10 @@ TEST_F(GLES2FormatTest, CompressedTexSubImage2DBucket) {
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),
+ 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);
EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -412,7 +391,9 @@ TEST_F(GLES2FormatTest, CompressedTexSubImage2DBucket) {
EXPECT_EQ(static_cast<GLsizei>(15), cmd.width);
EXPECT_EQ(static_cast<GLsizei>(16), cmd.height);
EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
- EXPECT_EQ(static_cast<GLuint>(18), cmd.bucket_id);
+ EXPECT_EQ(static_cast<GLsizei>(18), cmd.imageSize);
+ EXPECT_EQ(static_cast<uint32_t>(19), cmd.data_shm_id);
+ EXPECT_EQ(static_cast<uint32_t>(20), cmd.data_shm_offset);
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
@@ -897,7 +878,6 @@ TEST_F(GLES2FormatTest, GetAttachedShaders) {
}
// TODO(gman): Write test for GetAttribLocation
-// TODO(gman): Write test for GetAttribLocationBucket
TEST_F(GLES2FormatTest, GetBooleanv) {
cmds::GetBooleanv& cmd = *GetBufferAs<cmds::GetBooleanv>();
void* next_cmd = cmd.Set(&cmd,
@@ -1177,7 +1157,6 @@ TEST_F(GLES2FormatTest, GetUniformiv) {
}
// TODO(gman): Write test for GetUniformLocation
-// TODO(gman): Write test for GetUniformLocationBucket
TEST_F(GLES2FormatTest, GetVertexAttribfv) {
cmds::GetVertexAttribfv& cmd = *GetBufferAs<cmds::GetVertexAttribfv>();
void* next_cmd = cmd.Set(&cmd,
@@ -1493,23 +1472,6 @@ TEST_F(GLES2FormatTest, ShaderBinary) {
CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
}
-TEST_F(GLES2FormatTest, ShaderSource) {
- cmds::ShaderSource& cmd = *GetBufferAs<cmds::ShaderSource>();
- 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::ShaderSource::kCmdId),
- cmd.header.command);
- EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
- EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
- EXPECT_EQ(static_cast<uint32_t>(12), cmd.data_shm_id);
- EXPECT_EQ(static_cast<uint32_t>(13), cmd.data_shm_offset);
- EXPECT_EQ(static_cast<uint32_t>(14), cmd.data_size);
- CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
-}
-
TEST_F(GLES2FormatTest, ShaderSourceBucket) {
cmds::ShaderSourceBucket& cmd = *GetBufferAs<cmds::ShaderSourceBucket>();
void* next_cmd =
@@ -3187,26 +3149,6 @@ TEST_F(GLES2FormatTest, ConsumeTextureCHROMIUMImmediate) {
}
// TODO(gman): Write test for CreateAndConsumeTextureCHROMIUMImmediate
-TEST_F(GLES2FormatTest, BindUniformLocationCHROMIUM) {
- cmds::BindUniformLocationCHROMIUM& cmd =
- *GetBufferAs<cmds::BindUniformLocationCHROMIUM>();
- void* next_cmd = cmd.Set(&cmd,
- static_cast<GLuint>(11),
- static_cast<GLint>(12),
- static_cast<uint32_t>(13),
- static_cast<uint32_t>(14),
- static_cast<uint32_t>(15));
- EXPECT_EQ(static_cast<uint32_t>(cmds::BindUniformLocationCHROMIUM::kCmdId),
- cmd.header.command);
- EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
- EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
- EXPECT_EQ(static_cast<GLint>(12), cmd.location);
- EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_shm_id);
- EXPECT_EQ(static_cast<uint32_t>(14), cmd.name_shm_offset);
- EXPECT_EQ(static_cast<uint32_t>(15), cmd.data_size);
- CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
-}
-
TEST_F(GLES2FormatTest, BindUniformLocationCHROMIUMBucket) {
cmds::BindUniformLocationCHROMIUMBucket& cmd =
*GetBufferAs<cmds::BindUniformLocationCHROMIUMBucket>();
« gpu/command_buffer/build_gles2_cmd_buffer.py ('K') | « gpu/command_buffer/common/gles2_cmd_format_autogen.h ('k') | gpu/command_buffer/common/gles2_cmd_ids_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698