Swizzle Uniform Locations

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 6073 matching lines @@
   GLint* location = GetSharedMemoryAs<GLint*>(
       location_shm_id, location_shm_offset, sizeof(GLint));
   if (!location) {
     return error::kOutOfBounds;
   }
   // Require the client to init this incase the context is lost an we are no
   // longer executing commands.
   if (*location != -1) {
     return error::kGenericError;
   }
-  *location = info->GetUniformLocation(name_str);
+  *location = program_manager()->SwizzleLocation(
+      info->GetUniformLocation(name_str));
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleGetUniformLocation(
     uint32 immediate_data_size, const gles2::GetUniformLocation& c) {
   uint32 name_size = c.data_size;
   const char* name = GetSharedMemoryAs<const char*>(
       c.name_shm_id, c.name_shm_offset, name_size);
   if (!name) {
     return error::kOutOfBounds;
@@ skipping 1017 matching lines @@
     return false;
   }
   result->size = size;
   *result_type = type;
   return true;
 }
 
 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;
   void* result;
   if (GetUniformSetup(
       program, location, c.params_shm_id, c.params_shm_offset,
       &error, &service_id, &result, &result_type)) {
     glGetUniformiv(
         service_id, location,
         static_cast<gles2::GetUniformiv::Result*>(result)->GetData());
   }
   return error;
 }
 
 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;
   Result* result;
   GLenum result_type;
   if (GetUniformSetup(
       program, location, c.params_shm_id, c.params_shm_offset,
       &error, &service_id, reinterpret_cast<void**>(&result), &result_type)) {
     if (result_type == GL_BOOL || result_type == GL_BOOL_VEC2 ||
         result_type == GL_BOOL_VEC3 || result_type == GL_BOOL_VEC4) {
@@ skipping 483 matching lines @@
     uint32 immediate_data_size, const gles2::GetProgramInfoCHROMIUM& c) {
   GLuint program = static_cast<GLuint>(c.program);
   uint32 bucket_id = c.bucket_id;
   Bucket* bucket = CreateBucket(bucket_id);
   bucket->SetSize(sizeof(ProgramInfoHeader));  // in case we fail.
   ProgramManager::ProgramInfo* info = NULL;
   info = GetProgramInfo(program);
   if (!info || !info->IsValid()) {
     return error::kNoError;
   }
-  info->GetProgramInfo(bucket);
+  info->GetProgramInfo(program_manager(), bucket);
   return error::kNoError;
 }
 
 error::ContextLostReason GLES2DecoderImpl::GetContextLostReason() {
   switch (reset_status_) {
   case GL_NO_ERROR:
     // TODO(kbr): improve the precision of the error code in this case.
     // Consider delegating to context for error code if MakeCurrent fails.
     return error::kUnknown;
   case GL_GUILTY_CONTEXT_RESET_ARB:
@@ skipping 342 matching lines @@
   }
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu