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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

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_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.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.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index e3c6598d7251cbf2107f410a332b2c205b97347e..77fed3dbd3abea381c9d3dab8cd9476e16549052 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -540,7 +540,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformivSucceeds) {
static_cast<GetUniformiv::Result*>(shared_memory_address_);
result->size = 0;
GetUniformiv cmd;
- cmd.Init(client_program_id_, kUniform2Location,
+ cmd.Init(client_program_id_,
+ program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_, GetUniformiv(kServiceProgramId, kUniform2Location, _))
.Times(1);
@@ -554,7 +555,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformivArrayElementSucceeds) {
static_cast<GetUniformiv::Result*>(shared_memory_address_);
result->size = 0;
GetUniformiv cmd;
- cmd.Init(client_program_id_, kUniform2ElementLocation,
+ cmd.Init(client_program_id_,
+ program_manager()->SwizzleLocation(kUniform2ElementLocation),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_,
GetUniformiv(kServiceProgramId, kUniform2ElementLocation, _))
@@ -570,7 +572,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformivBadProgramFails) {
result->size = 0;
GetUniformiv cmd;
// non-existant program
- cmd.Init(kInvalidClientId, kUniform2Location,
+ cmd.Init(kInvalidClientId,
+ program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_, GetUniformiv(_, _, _))
.Times(0);
@@ -581,7 +584,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformivBadProgramFails) {
// this case.
#if GLES2_TEST_SHADER_VS_PROGRAM_IDS
result->size = kInitialResult;
- cmd.Init(client_shader_id_, kUniform2Location,
+ cmd.Init(client_shader_id_,
+ program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0U, result->size);
@@ -596,7 +600,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformivBadProgramFails) {
cmd2.Init(kNewClientId);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
result->size = kInitialResult;
- cmd.Init(kNewClientId, kUniform2Location,
+ cmd.Init(kNewClientId,
+ program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0U, result->size);
@@ -620,7 +625,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformivBadLocationFails) {
TEST_F(GLES2DecoderWithShaderTest, GetUniformivBadSharedMemoryFails) {
GetUniformiv cmd;
- cmd.Init(client_program_id_, kUniform2Location,
+ cmd.Init(client_program_id_,
+ program_manager()->SwizzleLocation(kUniform2Location),
kInvalidSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_, GetUniformiv(_, _, _))
.Times(0);
@@ -635,7 +641,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformfvSucceeds) {
static_cast<GetUniformfv::Result*>(shared_memory_address_);
result->size = 0;
GetUniformfv cmd;
- cmd.Init(client_program_id_, kUniform2Location,
+ cmd.Init(client_program_id_,
+ program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_, GetUniformfv(kServiceProgramId, kUniform2Location, _))
.Times(1);
@@ -649,7 +656,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformfvArrayElementSucceeds) {
static_cast<GetUniformfv::Result*>(shared_memory_address_);
result->size = 0;
GetUniformfv cmd;
- cmd.Init(client_program_id_, kUniform2ElementLocation,
+ cmd.Init(client_program_id_,
+ program_manager()->SwizzleLocation(kUniform2ElementLocation),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_,
GetUniformfv(kServiceProgramId, kUniform2ElementLocation, _))
@@ -665,7 +673,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformfvBadProgramFails) {
result->size = 0;
GetUniformfv cmd;
// non-existant program
- cmd.Init(kInvalidClientId, kUniform2Location,
+ cmd.Init(kInvalidClientId,
+ program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_, GetUniformfv(_, _, _))
.Times(0);
@@ -676,7 +685,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformfvBadProgramFails) {
// this case.
#if GLES2_TEST_SHADER_VS_PROGRAM_IDS
result->size = kInitialResult;
- cmd.Init(client_shader_id_, kUniform2Location,
+ cmd.Init(client_shader_id_,
+ program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0U, result->size);
@@ -691,7 +701,7 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformfvBadProgramFails) {
cmd2.Init(kNewClientId);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
result->size = kInitialResult;
- cmd.Init(kNewClientId, kUniform2Location,
+ cmd.Init(kNewClientId, program_manager()->SwizzleLocation(kUniform2Location),
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0U, result->size);
@@ -715,7 +725,8 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformfvBadLocationFails) {
TEST_F(GLES2DecoderWithShaderTest, GetUniformfvBadSharedMemoryFails) {
GetUniformfv cmd;
- cmd.Init(client_program_id_, kUniform2Location,
+ cmd.Init(client_program_id_,
+ program_manager()->SwizzleLocation(kUniform2Location),
kInvalidSharedMemoryId, kSharedMemoryOffset);
EXPECT_CALL(*gl_, GetUniformfv(_, _, _))
.Times(0);
@@ -1231,31 +1242,33 @@ TEST_F(GLES2DecoderTest, GenerateMipmapWrongFormatsFails) {
TEST_F(GLES2DecoderWithShaderTest, Uniform1iValidArgs) {
EXPECT_CALL(*gl_, Uniform1i(kUniform1Location, 2));
Uniform1i cmd;
- cmd.Init(kUniform1Location, 2);
+ cmd.Init(program_manager()->SwizzleLocation(kUniform1Location), 2);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
TEST_F(GLES2DecoderWithShaderTest, Uniform1ivValidArgs) {
EXPECT_CALL(
- *gl_, Uniform1iv(
- kUniform1Location, 1,
+ *gl_, Uniform1iv(kUniform1Location, 1,
reinterpret_cast<const GLint*>(shared_memory_address_)));
Uniform1iv cmd;
- cmd.Init(kUniform1Location, 1, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(program_manager()->SwizzleLocation(kUniform1Location),
+ 1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
TEST_F(GLES2DecoderWithShaderTest, Uniform1ivInvalidArgs2_0) {
EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0);
Uniform1iv cmd;
- cmd.Init(kUniform1Location, 1, kInvalidSharedMemoryId, 0);
+ cmd.Init(program_manager()->SwizzleLocation(kUniform1Location),
+ 1, kInvalidSharedMemoryId, 0);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
TEST_F(GLES2DecoderWithShaderTest, Uniform1ivInvalidArgs2_1) {
EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0);
Uniform1iv cmd;
- cmd.Init(kUniform1Location, 1, shared_memory_id_, kInvalidSharedMemoryOffset);
+ cmd.Init(program_manager()->SwizzleLocation(kUniform1Location),
+ 1, shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
}
@@ -1266,7 +1279,7 @@ TEST_F(GLES2DecoderWithShaderTest, Uniform1ivImmediateValidArgs) {
Uniform1iv(kUniform1Location, 1,
reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
GLint temp[1 * 2] = { 0, };
- cmd.Init(kUniform1Location, 1, &temp[0]);
+ cmd.Init(program_manager()->SwizzleLocation(kUniform1Location), 1, &temp[0]);
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
}
@@ -1274,7 +1287,8 @@ TEST_F(GLES2DecoderWithShaderTest, Uniform1ivImmediateValidArgs) {
TEST_F(GLES2DecoderWithShaderTest, Uniform1ivInvalidValidArgs) {
EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0);
Uniform1iv cmd;
- cmd.Init(kUniform1Location, 2, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(program_manager()->SwizzleLocation(kUniform1Location),
+ 2, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
}
@@ -1282,7 +1296,8 @@ TEST_F(GLES2DecoderWithShaderTest, Uniform1ivInvalidValidArgs) {
TEST_F(GLES2DecoderWithShaderTest, Uniform1ivZeroCount) {
EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0);
Uniform1iv cmd;
- cmd.Init(kUniform1Location, 0, shared_memory_id_, shared_memory_offset_);
+ cmd.Init(program_manager()->SwizzleLocation(kUniform1Location),
+ 0, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
@@ -2146,7 +2161,7 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformLocation) {
kSharedMemoryId, kSharedMemoryOffset,
kNameSize);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(kUniform2Location, *result);
+ EXPECT_EQ(program_manager()->SwizzleLocation(kUniform2Location), *result);
memcpy(name, kNonExistentName, kNonExistentNameSize);
*result = -1;
cmd.Init(client_program_id_,
@@ -2227,7 +2242,7 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationImmediate) {
cmd.Init(client_program_id_, kUniform2Name,
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
- EXPECT_EQ(kUniform2Location, *result);
+ EXPECT_EQ(program_manager()->SwizzleLocation(kUniform2Location), *result);
*result = -1;
cmd.Init(client_program_id_, kNonExistentName,
kSharedMemoryId, kSharedMemoryOffset);
@@ -2269,7 +2284,7 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationBucket) {
cmd.Init(client_program_id_, kBucketId,
kSharedMemoryId, kSharedMemoryOffset);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(kUniform2Location, *result);
+ EXPECT_EQ(program_manager()->SwizzleLocation(kUniform2Location), *result);
SetBucketAsCString(kBucketId, kNonExistentName);
*result = -1;
cmd.Init(client_program_id_, kBucketId,
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698