Swizzle Uniform Locations

gpu/command_buffer/service/program_manager_unittest.cc

Index: gpu/command_buffer/service/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index c58cda1d0a0899530a44335d6175ce4aa06248a1..157a2b231a5f0b399e8c68ae4b3abe27ccc22793 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -125,6 +125,17 @@ TEST_F(ProgramManagerTest, ProgramInfo) {
   EXPECT_TRUE(info1->log_info() == NULL);
 }
 
+TEST_F(ProgramManagerTest, SwizzleLocation) {
+  GLint power = 1;
+  for (GLint p = 0; p < 5; ++p, power *= 10) {
+    GLint limit = power * 20 + 1;
+    for (GLint ii = -limit; ii < limit; ii += power) {
+      GLint s = manager_.SwizzleLocation(ii);
+      EXPECT_EQ(ii, manager_.UnswizzleLocation(s));
+    }
+  }
+}
+
 class ProgramManagerWithShaderTest : public testing::Test {
  public:
   ProgramManagerWithShaderTest()
@@ -848,7 +859,7 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoGetProgramInfo) {
   const ProgramManager::ProgramInfo* program_info =
       manager_.GetProgramInfo(kClientProgramId);
   ASSERT_TRUE(program_info != NULL);
-  program_info->GetProgramInfo(&bucket);
+  program_info->GetProgramInfo(&manager_, &bucket);
   ProgramInfoHeader* header =
       bucket.GetDataAs<ProgramInfoHeader*>(0, sizeof(ProgramInfoHeader));
   ASSERT_TRUE(header != NULL);
@@ -885,7 +896,8 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoGetProgramInfo) {
         input->location_offset, sizeof(int32) * input->size);
     ASSERT_TRUE(locations != NULL);
     for (int32 jj = 0; jj < input->size; ++jj) {
-      EXPECT_EQ(expected.location + jj * 2, locations[jj]);
+      EXPECT_EQ(manager_.SwizzleLocation(expected.location + jj * 2),
+                locations[jj]);
     }
     const char* name_buf = bucket.GetDataAs<const char*>(
         input->name_offset, input->name_length);