command_buffer: Use GLSL core version that matches the OpenGL version

gpu/command_buffer/service/shader_translator.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 13 matching lines @@
 typedef base::hash_map<std::string, sh::Varying> VaryingMap;
 // Mapping between hashed name and original name.
 typedef base::hash_map<std::string, std::string> NameMap;
 
 // Translates a GLSL ES 2.0 shader to desktop GLSL shader, or just
 // validates GLSL ES 2.0 shaders on a true GLSL ES implementation.
 class ShaderTranslatorInterface
     : public base::RefCounted<ShaderTranslatorInterface> {
  public:
   ShaderTranslatorInterface() {}
-  enum GlslImplementationType {
-    kGlsl,
-    kGlslES
-  };
 
   // Initializes the translator.
   // Must be called once before using the translator object.
-  virtual bool Init(
-      sh::GLenum shader_type,
-      ShShaderSpec shader_spec,
-      const ShBuiltInResources* resources,
-      GlslImplementationType glsl_implementation_type,
-      ShCompileOptions driver_bug_workarounds) = 0;
+  virtual bool Init(sh::GLenum shader_type,
+                    ShShaderSpec shader_spec,
+                    const ShBuiltInResources* resources,
+                    ShShaderOutput shader_output_language,
+                    ShCompileOptions driver_bug_workarounds) = 0;
 
   // Translates the given shader source.
   // Returns true if translation is successful, false otherwise.
   // Always fill |info_log| if it's non-null.
   // Upon success, fill |translated_shader|, |attrib_map|, |uniform_map|,
   // |varying_map|, and |name_map| if they are non-null.
   virtual bool Translate(const std::string& shader_source,
                          std::string* info_log,
                          std::string* translated_shader,
                          int* shader_version,
@@ skipping 28 matching lines @@
    private:
     DISALLOW_COPY_AND_ASSIGN(DestructionObserver);
   };
 
   ShaderTranslator();
 
   // Overridden from ShaderTranslatorInterface.
   bool Init(sh::GLenum shader_type,
             ShShaderSpec shader_spec,
             const ShBuiltInResources* resources,
-            GlslImplementationType glsl_implementation_type,
+            ShShaderOutput shader_output_language,
             ShCompileOptions driver_bug_workarounds) override;
 
   // Overridden from ShaderTranslatorInterface.
   bool Translate(const std::string& shader_source,
                  std::string* info_log,
                  std::string* translated_source,
                  int* shader_version,
                  AttributeMap* attrib_map,
                  UniformMap* uniform_map,
                  VaryingMap* varying_map,
                  NameMap* name_map) const override;
 
   std::string GetStringForOptionsThatWouldAffectCompilation() const override;
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
 
  private:
   ~ShaderTranslator() override;
 
   int GetCompileOptions() const;
 
   ShHandle compiler_;
-  bool implementation_is_glsl_es_;
   ShCompileOptions driver_bug_workarounds_;
   base::ObserverList<DestructionObserver> destruction_observers_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_