command_buffer: Use GLSL core version that matches the OpenGL version

gpu/command_buffer/service/shader_translator_unittest.cc

Index: gpu/command_buffer/service/shader_translator_unittest.cc
diff --git a/gpu/command_buffer/service/shader_translator_unittest.cc b/gpu/command_buffer/service/shader_translator_unittest.cc
index 5f6173818f922b1fccf54e31bf338e68873c5ec4..c43ade6c20b3daaff816ebccef9b8fda8773e900 100644
--- a/gpu/command_buffer/service/shader_translator_unittest.cc
+++ b/gpu/command_buffer/service/shader_translator_unittest.cc
@@ -27,14 +27,12 @@ class ShaderTranslatorTest : public testing::Test {
     vertex_translator_ = new ShaderTranslator();
     fragment_translator_ = new ShaderTranslator();
 
-    ASSERT_TRUE(vertex_translator_->Init(
-        GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
-        ShaderTranslatorInterface::kGlsl,
-        SH_EMULATE_BUILT_IN_FUNCTIONS));
-    ASSERT_TRUE(fragment_translator_->Init(
-        GL_FRAGMENT_SHADER, SH_GLES2_SPEC, &resources,
-        ShaderTranslatorInterface::kGlsl,
-        static_cast<ShCompileOptions>(0)));
+    ASSERT_TRUE(vertex_translator_->Init(GL_VERTEX_SHADER, SH_GLES2_SPEC,
+                                         &resources, SH_GLSL_150_CORE_OUTPUT,

[Ken Russell (switch to Gerrit), 2015/08/05 18:29:38]

I'm not sure the 150_CORE_OUTPUT will be the common case -- COMPATIBILITY_OUTPUT
seems more likely.

[Kimmo Kinnunen, 2015/08/10 08:36:34]

Done.

+                                         SH_EMULATE_BUILT_IN_FUNCTIONS));
+    ASSERT_TRUE(fragment_translator_->Init(GL_FRAGMENT_SHADER, SH_GLES2_SPEC,
+                                           &resources, SH_GLSL_150_CORE_OUTPUT,
+                                           static_cast<ShCompileOptions>(0)));
   }
   void TearDown() override {
     vertex_translator_ = NULL;
@@ -290,19 +288,16 @@ TEST_F(ShaderTranslatorTest, OptionsString) {
   ShBuiltInResources resources;
   ShInitBuiltInResources(&resources);
 
-  ASSERT_TRUE(translator_1->Init(
-      GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
-      ShaderTranslatorInterface::kGlsl,
-      SH_EMULATE_BUILT_IN_FUNCTIONS));
-  ASSERT_TRUE(translator_2->Init(
-      GL_FRAGMENT_SHADER, SH_GLES2_SPEC, &resources,
-      ShaderTranslatorInterface::kGlsl,
-      static_cast<ShCompileOptions>(0)));
+  ASSERT_TRUE(translator_1->Init(GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
+                                 SH_GLSL_150_CORE_OUTPUT,
+                                 SH_EMULATE_BUILT_IN_FUNCTIONS));
+  ASSERT_TRUE(translator_2->Init(GL_FRAGMENT_SHADER, SH_GLES2_SPEC, &resources,
+                                 SH_GLSL_150_CORE_OUTPUT,
+                                 static_cast<ShCompileOptions>(0)));
   resources.EXT_draw_buffers = 1;
-  ASSERT_TRUE(translator_3->Init(
-      GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
-      ShaderTranslatorInterface::kGlsl,
-      SH_EMULATE_BUILT_IN_FUNCTIONS));
+  ASSERT_TRUE(translator_3->Init(GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
+                                 SH_GLSL_150_CORE_OUTPUT,
+                                 SH_EMULATE_BUILT_IN_FUNCTIONS));
 
   std::string options_1(
       translator_1->GetStringForOptionsThatWouldAffectCompilation());