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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h

Issue 9309047: Swizzle Uniform Locations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unsigned math Created 8 years, 10 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
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
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 d85c69d56d8ac7c2f48266220178ae7dc71e2714..6d0b1b79134d5012f1876a023dc3ea7e8e3ed24d 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
@@ -700,7 +700,7 @@ TEST_F(GLES2DecoderTest2, Uniform1fValidArgs) {
EXPECT_CALL(*gl_, Uniform1fv(1, 1, _));
SpecializedSetup<Uniform1f, 0>(true);
Uniform1f cmd;
- cmd.Init(1, 2);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -711,7 +711,9 @@ TEST_F(GLES2DecoderTest2, Uniform1fvValidArgs) {
1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform1fv, 0>(true);
Uniform1fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -720,7 +722,9 @@ TEST_F(GLES2DecoderTest2, Uniform1fvInvalidArgs1_0) {
EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0);
SpecializedSetup<Uniform1fv, 0>(false);
Uniform1fv cmd;
- cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -729,7 +733,8 @@ TEST_F(GLES2DecoderTest2, Uniform1fvInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0);
SpecializedSetup<Uniform1fv, 0>(false);
Uniform1fv cmd;
- cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(1), 2, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -737,7 +742,9 @@ TEST_F(GLES2DecoderTest2, Uniform1fvInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0);
SpecializedSetup<Uniform1fv, 0>(false);
Uniform1fv cmd;
- cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -747,7 +754,9 @@ TEST_F(GLES2DecoderTest2, Uniform1fvValidArgsCountTooLarge) {
3, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform1fv, 0>(true);
Uniform1fv cmd;
- cmd.Init(3, 5, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -760,7 +769,7 @@ TEST_F(GLES2DecoderTest2, Uniform1fvImmediateValidArgs) {
reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<Uniform1fvImmediate, 0>(true);
GLfloat temp[1 * 2] = { 0, };
- cmd.Init(1, 2, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -773,7 +782,7 @@ TEST_F(GLES2DecoderTest2, Uniform2fValidArgs) {
EXPECT_CALL(*gl_, Uniform2fv(1, 1, _));
SpecializedSetup<Uniform2f, 0>(true);
Uniform2f cmd;
- cmd.Init(1, 2, 3);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, 3);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -784,7 +793,9 @@ TEST_F(GLES2DecoderTest2, Uniform2fvValidArgs) {
1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform2fv, 0>(true);
Uniform2fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -793,7 +804,9 @@ TEST_F(GLES2DecoderTest2, Uniform2fvInvalidArgs1_0) {
EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0);
SpecializedSetup<Uniform2fv, 0>(false);
Uniform2fv cmd;
- cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -802,7 +815,8 @@ TEST_F(GLES2DecoderTest2, Uniform2fvInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0);
SpecializedSetup<Uniform2fv, 0>(false);
Uniform2fv cmd;
- cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(1), 2, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -810,7 +824,9 @@ TEST_F(GLES2DecoderTest2, Uniform2fvInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0);
SpecializedSetup<Uniform2fv, 0>(false);
Uniform2fv cmd;
- cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -820,7 +836,9 @@ TEST_F(GLES2DecoderTest2, Uniform2fvValidArgsCountTooLarge) {
3, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform2fv, 0>(true);
Uniform2fv cmd;
- cmd.Init(3, 5, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -833,7 +851,7 @@ TEST_F(GLES2DecoderTest2, Uniform2fvImmediateValidArgs) {
reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<Uniform2fvImmediate, 0>(true);
GLfloat temp[2 * 2] = { 0, };
- cmd.Init(1, 2, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -843,7 +861,7 @@ TEST_F(GLES2DecoderTest2, Uniform2iValidArgs) {
EXPECT_CALL(*gl_, Uniform2i(1, 2, 3));
SpecializedSetup<Uniform2i, 0>(true);
Uniform2i cmd;
- cmd.Init(1, 2, 3);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, 3);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -854,7 +872,9 @@ TEST_F(GLES2DecoderTest2, Uniform2ivValidArgs) {
1, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
SpecializedSetup<Uniform2iv, 0>(true);
Uniform2iv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -863,7 +883,9 @@ TEST_F(GLES2DecoderTest2, Uniform2ivInvalidArgs1_0) {
EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0);
SpecializedSetup<Uniform2iv, 0>(false);
Uniform2iv cmd;
- cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -872,7 +894,8 @@ TEST_F(GLES2DecoderTest2, Uniform2ivInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0);
SpecializedSetup<Uniform2iv, 0>(false);
Uniform2iv cmd;
- cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(1), 2, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -880,7 +903,9 @@ TEST_F(GLES2DecoderTest2, Uniform2ivInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0);
SpecializedSetup<Uniform2iv, 0>(false);
Uniform2iv cmd;
- cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -890,7 +915,9 @@ TEST_F(GLES2DecoderTest2, Uniform2ivValidArgsCountTooLarge) {
3, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
SpecializedSetup<Uniform2iv, 0>(true);
Uniform2iv cmd;
- cmd.Init(3, 5, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -903,7 +930,7 @@ TEST_F(GLES2DecoderTest2, Uniform2ivImmediateValidArgs) {
reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<Uniform2ivImmediate, 0>(true);
GLint temp[2 * 2] = { 0, };
- cmd.Init(1, 2, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -913,7 +940,7 @@ TEST_F(GLES2DecoderTest2, Uniform3fValidArgs) {
EXPECT_CALL(*gl_, Uniform3fv(1, 1, _));
SpecializedSetup<Uniform3f, 0>(true);
Uniform3f cmd;
- cmd.Init(1, 2, 3, 4);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, 3, 4);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -924,7 +951,9 @@ TEST_F(GLES2DecoderTest2, Uniform3fvValidArgs) {
1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform3fv, 0>(true);
Uniform3fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -933,7 +962,9 @@ TEST_F(GLES2DecoderTest2, Uniform3fvInvalidArgs1_0) {
EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0);
SpecializedSetup<Uniform3fv, 0>(false);
Uniform3fv cmd;
- cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -942,7 +973,8 @@ TEST_F(GLES2DecoderTest2, Uniform3fvInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0);
SpecializedSetup<Uniform3fv, 0>(false);
Uniform3fv cmd;
- cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(1), 2, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -950,7 +982,9 @@ TEST_F(GLES2DecoderTest2, Uniform3fvInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0);
SpecializedSetup<Uniform3fv, 0>(false);
Uniform3fv cmd;
- cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -960,7 +994,9 @@ TEST_F(GLES2DecoderTest2, Uniform3fvValidArgsCountTooLarge) {
3, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform3fv, 0>(true);
Uniform3fv cmd;
- cmd.Init(3, 5, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -973,7 +1009,7 @@ TEST_F(GLES2DecoderTest2, Uniform3fvImmediateValidArgs) {
reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<Uniform3fvImmediate, 0>(true);
GLfloat temp[3 * 2] = { 0, };
- cmd.Init(1, 2, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -983,7 +1019,7 @@ TEST_F(GLES2DecoderTest2, Uniform3iValidArgs) {
EXPECT_CALL(*gl_, Uniform3i(1, 2, 3, 4));
SpecializedSetup<Uniform3i, 0>(true);
Uniform3i cmd;
- cmd.Init(1, 2, 3, 4);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, 3, 4);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -994,7 +1030,9 @@ TEST_F(GLES2DecoderTest2, Uniform3ivValidArgs) {
1, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
SpecializedSetup<Uniform3iv, 0>(true);
Uniform3iv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1003,7 +1041,9 @@ TEST_F(GLES2DecoderTest2, Uniform3ivInvalidArgs1_0) {
EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0);
SpecializedSetup<Uniform3iv, 0>(false);
Uniform3iv cmd;
- cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1012,7 +1052,8 @@ TEST_F(GLES2DecoderTest2, Uniform3ivInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0);
SpecializedSetup<Uniform3iv, 0>(false);
Uniform3iv cmd;
- cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(1), 2, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1020,7 +1061,9 @@ TEST_F(GLES2DecoderTest2, Uniform3ivInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0);
SpecializedSetup<Uniform3iv, 0>(false);
Uniform3iv cmd;
- cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1030,7 +1073,9 @@ TEST_F(GLES2DecoderTest2, Uniform3ivValidArgsCountTooLarge) {
3, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
SpecializedSetup<Uniform3iv, 0>(true);
Uniform3iv cmd;
- cmd.Init(3, 5, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1043,7 +1088,7 @@ TEST_F(GLES2DecoderTest2, Uniform3ivImmediateValidArgs) {
reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<Uniform3ivImmediate, 0>(true);
GLint temp[3 * 2] = { 0, };
- cmd.Init(1, 2, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -1053,7 +1098,7 @@ TEST_F(GLES2DecoderTest2, Uniform4fValidArgs) {
EXPECT_CALL(*gl_, Uniform4fv(1, 1, _));
SpecializedSetup<Uniform4f, 0>(true);
Uniform4f cmd;
- cmd.Init(1, 2, 3, 4, 5);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, 3, 4, 5);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1064,7 +1109,9 @@ TEST_F(GLES2DecoderTest2, Uniform4fvValidArgs) {
1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform4fv, 0>(true);
Uniform4fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1073,7 +1120,9 @@ TEST_F(GLES2DecoderTest2, Uniform4fvInvalidArgs1_0) {
EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0);
SpecializedSetup<Uniform4fv, 0>(false);
Uniform4fv cmd;
- cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1082,7 +1131,8 @@ TEST_F(GLES2DecoderTest2, Uniform4fvInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0);
SpecializedSetup<Uniform4fv, 0>(false);
Uniform4fv cmd;
- cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(1), 2, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1090,7 +1140,9 @@ TEST_F(GLES2DecoderTest2, Uniform4fvInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0);
SpecializedSetup<Uniform4fv, 0>(false);
Uniform4fv cmd;
- cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1100,7 +1152,9 @@ TEST_F(GLES2DecoderTest2, Uniform4fvValidArgsCountTooLarge) {
3, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
SpecializedSetup<Uniform4fv, 0>(true);
Uniform4fv cmd;
- cmd.Init(3, 5, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1113,7 +1167,7 @@ TEST_F(GLES2DecoderTest2, Uniform4fvImmediateValidArgs) {
reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<Uniform4fvImmediate, 0>(true);
GLfloat temp[4 * 2] = { 0, };
- cmd.Init(1, 2, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -1123,7 +1177,7 @@ TEST_F(GLES2DecoderTest2, Uniform4iValidArgs) {
EXPECT_CALL(*gl_, Uniform4i(1, 2, 3, 4, 5));
SpecializedSetup<Uniform4i, 0>(true);
Uniform4i cmd;
- cmd.Init(1, 2, 3, 4, 5);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, 3, 4, 5);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1134,7 +1188,9 @@ TEST_F(GLES2DecoderTest2, Uniform4ivValidArgs) {
1, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
SpecializedSetup<Uniform4iv, 0>(true);
Uniform4iv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1143,7 +1199,9 @@ TEST_F(GLES2DecoderTest2, Uniform4ivInvalidArgs1_0) {
EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0);
SpecializedSetup<Uniform4iv, 0>(false);
Uniform4iv cmd;
- cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1152,7 +1210,8 @@ TEST_F(GLES2DecoderTest2, Uniform4ivInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0);
SpecializedSetup<Uniform4iv, 0>(false);
Uniform4iv cmd;
- cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(1), 2, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1160,7 +1219,9 @@ TEST_F(GLES2DecoderTest2, Uniform4ivInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0);
SpecializedSetup<Uniform4iv, 0>(false);
Uniform4iv cmd;
- cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1170,7 +1231,9 @@ TEST_F(GLES2DecoderTest2, Uniform4ivValidArgsCountTooLarge) {
3, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
SpecializedSetup<Uniform4iv, 0>(true);
Uniform4iv cmd;
- cmd.Init(3, 5, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1183,7 +1246,7 @@ TEST_F(GLES2DecoderTest2, Uniform4ivImmediateValidArgs) {
reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<Uniform4ivImmediate, 0>(true);
GLint temp[4 * 2] = { 0, };
- cmd.Init(1, 2, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -1196,7 +1259,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvValidArgs) {
shared_memory_address_)));
SpecializedSetup<UniformMatrix2fv, 0>(true);
UniformMatrix2fv cmd;
- cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1205,7 +1270,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs1_0) {
EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix2fv, 0>(false);
UniformMatrix2fv cmd;
- cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1214,7 +1281,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs2_0) {
EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix2fv, 0>(false);
UniformMatrix2fv cmd;
- cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, true, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
}
@@ -1223,7 +1292,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs3_0) {
EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix2fv, 0>(false);
UniformMatrix2fv cmd;
- cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1231,7 +1302,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs3_1) {
EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix2fv, 0>(false);
UniformMatrix2fv cmd;
- cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1242,7 +1315,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvValidArgsCountTooLarge) {
shared_memory_address_)));
SpecializedSetup<UniformMatrix2fv, 0>(true);
UniformMatrix2fv cmd;
- cmd.Init(3, 5, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1256,7 +1331,7 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvImmediateValidArgs) {
reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<UniformMatrix2fvImmediate, 0>(true);
GLfloat temp[4 * 2] = { 0, };
- cmd.Init(1, 2, false, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, false, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -1268,7 +1343,7 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvImmediateInvalidArgs2_0) {
EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix2fvImmediate, 0>(false);
GLfloat temp[4 * 2] = { 0, };
- cmd.Init(1, 2, true, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, true, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
@@ -1281,7 +1356,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvValidArgs) {
shared_memory_address_)));
SpecializedSetup<UniformMatrix3fv, 0>(true);
UniformMatrix3fv cmd;
- cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1290,7 +1367,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs1_0) {
EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix3fv, 0>(false);
UniformMatrix3fv cmd;
- cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1299,7 +1378,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs2_0) {
EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix3fv, 0>(false);
UniformMatrix3fv cmd;
- cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, true, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
}
@@ -1308,7 +1389,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs3_0) {
EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix3fv, 0>(false);
UniformMatrix3fv cmd;
- cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1316,7 +1399,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs3_1) {
EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix3fv, 0>(false);
UniformMatrix3fv cmd;
- cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1327,7 +1412,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvValidArgsCountTooLarge) {
shared_memory_address_)));
SpecializedSetup<UniformMatrix3fv, 0>(true);
UniformMatrix3fv cmd;
- cmd.Init(3, 5, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1341,7 +1428,7 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvImmediateValidArgs) {
reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<UniformMatrix3fvImmediate, 0>(true);
GLfloat temp[9 * 2] = { 0, };
- cmd.Init(1, 2, false, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, false, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -1353,7 +1440,7 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvImmediateInvalidArgs2_0) {
EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix3fvImmediate, 0>(false);
GLfloat temp[9 * 2] = { 0, };
- cmd.Init(1, 2, true, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, true, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
@@ -1366,7 +1453,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvValidArgs) {
shared_memory_address_)));
SpecializedSetup<UniformMatrix4fv, 0>(true);
UniformMatrix4fv cmd;
- cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1375,7 +1464,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs1_0) {
EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix4fv, 0>(false);
UniformMatrix4fv cmd;
- cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), -1, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1384,7 +1475,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs2_0) {
EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix4fv, 0>(false);
UniformMatrix4fv cmd;
- cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, true, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
}
@@ -1393,7 +1486,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs3_0) {
EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix4fv, 0>(false);
UniformMatrix4fv cmd;
- cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1401,7 +1496,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs3_1) {
EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix4fv, 0>(false);
UniformMatrix4fv cmd;
- cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 1), 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1412,7 +1509,9 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvValidArgsCountTooLarge) {
shared_memory_address_)));
SpecializedSetup<UniformMatrix4fv, 0>(true);
UniformMatrix4fv cmd;
- cmd.Init(3, 5, false, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(
+ program_manager()->SwizzleLocation(
+ 3), 5, false, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -1426,7 +1525,7 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvImmediateValidArgs) {
reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
SpecializedSetup<UniformMatrix4fvImmediate, 0>(true);
GLfloat temp[16 * 2] = { 0, };
- cmd.Init(1, 2, false, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, false, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -1438,7 +1537,7 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvImmediateInvalidArgs2_0) {
EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
SpecializedSetup<UniformMatrix4fvImmediate, 0>(false);
GLfloat temp[16 * 2] = { 0, };
- cmd.Init(1, 2, true, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(1), 2, true, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698