Add support for GL_CHROMIUM_consistent_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 4911 matching lines @@
 }
 
 void GLES2DecoderImpl::LogMessage(const std::string& msg) {
   if (log_message_count_ < kMaxLogMessages ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGLErrorLimit)) {
     ++log_message_count_;
     // LOG this unless logging is turned off as any chromium code that
     // generates these errors probably has a bug.
     if (log_synthesized_gl_errors()) {
-      LOG(ERROR) << last_error_;
+      LOG(ERROR) << msg;
     }
     if (!msg_callback_.is_null()) {
       msg_callback_.Run(0, msg);
     }
   } else {
     if (log_message_count_ == kMaxLogMessages) {
       ++log_message_count_;
       LOG(ERROR)
           << "Too many GL errors, not reporting any more for this context."
           << " use --disable-gl-error-limit to see all errors.";
@@ skipping 1554 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 = program_manager()->SwizzleLocation(
+  *location = GLES2Util::SwizzleLocation(
       info->GetUniformFakeLocation(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) {
@@ skipping 1288 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 fake_location = program_manager()->UnswizzleLocation(c.location);
+  GLint fake_location = GLES2Util::UnswizzleLocation(c.location);
   GLuint service_id;
   GLenum result_type;
   GLint real_location = -1;
   Error error;
   void* result;
   if (GetUniformSetup(
       program, fake_location, c.params_shm_id, c.params_shm_offset,
       &error, &real_location, &service_id, &result, &result_type)) {
     glGetUniformiv(
         service_id, real_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 fake_location = program_manager()->UnswizzleLocation(c.location);
+  GLint fake_location = GLES2Util::UnswizzleLocation(c.location);
   GLuint service_id;
   GLint real_location = -1;
   Error error;
   typedef gles2::GetUniformfv::Result Result;
   Result* result;
   GLenum result_type;
   if (GetUniformSetup(
       program, fake_location, c.params_shm_id, c.params_shm_offset,
       &error, &real_location, &service_id,
       reinterpret_cast<void**>(&result), &result_type)) {
@@ skipping 1166 matching lines @@
   BindAndApplyTextureParameters(info);
 }
 
 // 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