Swizzle Uniform Locations

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index e45d18315cf0ff73d27a3af71f69328f0469a736..39cccbfc67a878bc6b14b962eb49bf29d036b1b5 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -6091,7 +6091,8 @@ error::Error GLES2DecoderImpl::GetUniformLocationHelper(
   if (*location != -1) {
     return error::kGenericError;
   }
-  *location = info->GetUniformLocation(name_str);
+  *location = program_manager()->SwizzleLocation(
+      info->GetUniformLocation(name_str));
   return error::kNoError;
 }
 
@@ -7129,7 +7130,7 @@ bool GLES2DecoderImpl::GetUniformSetup(
 error::Error GLES2DecoderImpl::HandleGetUniformiv(
     uint32 immediate_data_size, const gles2::GetUniformiv& c) {
   GLuint program = c.program;
-  GLint location = c.location;
+  GLint location = program_manager()->UnswizzleLocation(c.location);
   GLuint service_id;
   GLenum result_type;
   Error error;
@@ -7147,7 +7148,7 @@ error::Error GLES2DecoderImpl::HandleGetUniformiv(
 error::Error GLES2DecoderImpl::HandleGetUniformfv(
     uint32 immediate_data_size, const gles2::GetUniformfv& c) {
   GLuint program = c.program;
-  GLint location = c.location;
+  GLint location = program_manager()->UnswizzleLocation(c.location);
   GLuint service_id;
   Error error;
   typedef gles2::GetUniformfv::Result Result;
@@ -7651,7 +7652,7 @@ error::Error GLES2DecoderImpl::HandleGetProgramInfoCHROMIUM(
   if (!info || !info->IsValid()) {
     return error::kNoError;
   }
-  info->GetProgramInfo(bucket);
+  info->GetProgramInfo(program_manager(), bucket);
   return error::kNoError;
 }