command_buffer: Use GLSL core version that matches the OpenGL version

gpu/command_buffer/service/shader_translator_unittest.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 <GLES2/gl2.h>
 
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 namespace gles2 {
 
 class ShaderTranslatorTest : public testing::Test {

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

Somewhere there should be some tests of the handling of the various GLSL
versions in the translator. They probably don't belong here, but it looks to me
like more tests are needed in src/tests/compiler_tests/ in ANGLE; please work
with Jamie and Geoff to add them.

  public:
   ShaderTranslatorTest() {
   }
 
   ~ShaderTranslatorTest() override {}
 
  protected:
   void SetUp() override {
     ShBuiltInResources resources;
     ShInitBuiltInResources(&resources);
     resources.MaxExpressionComplexity = 32;
     resources.MaxCallStackDepth = 32;
 
     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;
     fragment_translator_ = NULL;
   }
 
   scoped_refptr<ShaderTranslator> vertex_translator_;
   scoped_refptr<ShaderTranslator> fragment_translator_;
 };
 
@@ skipping 235 matching lines @@
 }
 
 TEST_F(ShaderTranslatorTest, OptionsString) {
   scoped_refptr<ShaderTranslator> translator_1 = new ShaderTranslator();
   scoped_refptr<ShaderTranslator> translator_2 = new ShaderTranslator();
   scoped_refptr<ShaderTranslator> translator_3 = new ShaderTranslator();
 
   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());
   std::string options_2(
       translator_1->GetStringForOptionsThatWouldAffectCompilation());
   std::string options_3(
       translator_2->GetStringForOptionsThatWouldAffectCompilation());
   std::string options_4(
       translator_3->GetStringForOptionsThatWouldAffectCompilation());
 
   EXPECT_EQ(options_1, options_2);
   EXPECT_NE(options_1, options_3);
   EXPECT_NE(options_1, options_4);
   EXPECT_NE(options_3, options_4);
 }
 
 }  // namespace gles2
 }  // namespace gpu