Added shader type to shader info.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2009 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 <vector>
@@ skipping 494 matching lines @@
         program_manager()->GetProgramInfo(client_id);
     return (info && !info->IsDeleted()) ? info : NULL;
   }
 
   // Deletes the program info for the given program.
   void RemoveProgramInfo(GLuint client_id) {
     program_manager()->RemoveProgramInfo(client_id);
   }
 
   // Creates a ShaderInfo for the given shader.
-  void CreateShaderInfo(GLuint client_id, GLuint service_id) {
-    shader_manager()->CreateShaderInfo(client_id, service_id);
+  void CreateShaderInfo(GLuint client_id,
+                        GLuint service_id,
+                        GLenum shader_type) {
+    shader_manager()->CreateShaderInfo(client_id, service_id, shader_type);
   }
 
   // Gets the shader info for the given shader. Returns NULL if none exists.
   ShaderManager::ShaderInfo* GetShaderInfo(GLuint client_id) {
     ShaderManager::ShaderInfo* info =
         shader_manager()->GetShaderInfo(client_id);
     return (info && !info->IsDeleted()) ? info : NULL;
   }
 
   // Deletes the shader info for the given shader.
@@ skipping 1171 matching lines @@
   }
   return true;
 }
 
 bool GLES2DecoderImpl::CreateShaderHelper(GLenum type, GLuint client_id) {
   if (GetShaderInfo(client_id)) {
     return false;
   }
   GLuint service_id = glCreateShader(type);
   if (service_id != 0) {
-    CreateShaderInfo(client_id, service_id);
+    CreateShaderInfo(client_id, service_id, type);
   }
   return true;
 }
 
 bool GLES2DecoderImpl::ValidateGLenumCompressedTextureInternalFormat(GLenum) {
   // TODO(gman): Add support for compressed texture formats.
   return false;
 }
 
 void GLES2DecoderImpl::DoActiveTexture(GLenum texture_unit) {
@@ skipping 780 matching lines @@
   if (!info) {
     SetGLError(GL_INVALID_VALUE);
     return;
   }
   // Translate GL ES 2.0 shader to Desktop GL shader and pass that to
   // glShaderSource and then glCompileShader.
   const char* shader_src = info->source().c_str();
 #if !defined(GLES2_GPU_SERVICE_BACKEND_NATIVE_GLES2)
 #if defined(GLES2_GPU_SERVICE_TRANSLATE_SHADER)
   int dbg_options = 0;
-  EShLanguage language = EShLangVertex;
+  EShLanguage language = info->shader_type() == GL_VERTEX_SHADER ?
+      EShLangVertex : EShLangFragment;
   TBuiltInResource resources;
   // TODO(alokp): Ask gman how to get appropriate values.
   resources.maxVertexAttribs = 8;
   resources.maxVertexUniformVectors = 128;
   resources.maxVaryingVectors = 8;
   resources.maxVertexTextureImageUnits = 0;
   resources.maxCombinedTextureImageUnits = 8;
   resources.maxTextureImageUnits = 8;
   resources.maxFragmentUniformVectors = 16;
   resources.maxDrawBuffers = 1;
@@ skipping 1084 matching lines @@
   return error::kNoError;
 }
 
 // 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