Add command buffer support for EXT_sRGB_write_control

gpu/command_buffer/service/feature_info_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 "gpu/command_buffer/service/feature_info.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 228 matching lines @@
     case ES3_on_Version3_2Compatibility:
       break;
     case ES2_on_Version3_2Compatibility:
       // sRGB features are available as core GL 3.2.
       expect_ext_srgb = true;
       break;
     default:
       NOTREACHED();
       break;
   }
+  // Note that because GL_EXT_sRGB is a substring of GL_EXT_sRGB_write_control,
+  // which is not part of the ES3 core, we have to be careful to search for
+  // "GL_EXT_sRGB ", and append a space to the end of the extension string.
   if (expect_ext_srgb) {
-    EXPECT_THAT(info_->extensions(), HasSubstr("GL_EXT_sRGB"));
+    EXPECT_THAT(info_->extensions() + " ", HasSubstr("GL_EXT_sRGB "));
     EXPECT_TRUE(info_->validators()->texture_format.IsValid(GL_SRGB_EXT));
     EXPECT_TRUE(info_->validators()->texture_format.IsValid(GL_SRGB_ALPHA_EXT));
     EXPECT_TRUE(info_->validators()->texture_internal_format.IsValid(
         GL_SRGB_EXT));
     EXPECT_TRUE(info_->validators()->texture_internal_format.IsValid(
         GL_SRGB_ALPHA_EXT));
     EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(
         GL_SRGB8_ALPHA8_EXT));
     EXPECT_TRUE(info_->validators()->framebuffer_parameter.IsValid(
         GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
   } else {
-    EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_EXT_sRGB")));
+    // Note that because GL_EXT_sRGB is a substring of

[Zhenyao Mo, 2016/11/30 19:31:11]

nit: remove this

[ccameron, 2016/11/30 23:59:44]

Done.

+    EXPECT_THAT(info_->extensions() + " ", Not(HasSubstr("GL_EXT_sRGB ")));
     EXPECT_FALSE(info_->validators()->texture_format.IsValid(GL_SRGB_EXT));
     EXPECT_FALSE(info_->validators()->texture_format.IsValid(
         GL_SRGB_ALPHA_EXT));
     EXPECT_FALSE(info_->validators()->texture_internal_format.IsValid(
         GL_SRGB_EXT));
     EXPECT_FALSE(info_->validators()->texture_internal_format.IsValid(
         GL_SRGB_ALPHA_EXT));
     EXPECT_FALSE(info_->validators()->render_buffer_format.IsValid(
         GL_SRGB8_ALPHA8_EXT));
     EXPECT_FALSE(info_->validators()->framebuffer_parameter.IsValid(
@@ skipping 313 matching lines @@
   SetupInitExpectationsWithGLVersion("", "", "OpenGL ES 2.0");
   EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_EXT_read_format_bgra")));
   EXPECT_FALSE(info_->feature_flags().ext_read_format_bgra);
   EXPECT_FALSE(info_->validators()->read_pixel_format.IsValid(GL_BGRA_EXT));
 }
 
 TEST_P(FeatureInfoTest, InitializeEXT_sRGB) {
   SetupInitExpectations("GL_EXT_sRGB GL_OES_rgb8_rgba8");
 
   if (GetContextType() == CONTEXT_TYPE_OPENGLES3) {
-    EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_EXT_sRGB")));
+    EXPECT_THAT(info_->extensions() + " ", Not(HasSubstr("GL_EXT_sRGB ")));
     EXPECT_FALSE(info_->validators()->texture_format.IsValid(GL_SRGB_EXT));
     EXPECT_FALSE(
         info_->validators()->texture_format.IsValid(GL_SRGB_ALPHA_EXT));
     EXPECT_FALSE(
         info_->validators()->texture_internal_format.IsValid(GL_SRGB_EXT));
     EXPECT_FALSE(info_->validators()->texture_internal_format.IsValid(
         GL_SRGB_ALPHA_EXT));
     EXPECT_FALSE(
         info_->validators()->render_buffer_format.IsValid(GL_SRGB8_ALPHA8_EXT));
     EXPECT_FALSE(info_->validators()->framebuffer_parameter.IsValid(
         GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
   } else {
-    EXPECT_THAT(info_->extensions(), HasSubstr("GL_EXT_sRGB"));
+    EXPECT_THAT(info_->extensions() + " ", HasSubstr("GL_EXT_sRGB "));
     EXPECT_TRUE(info_->validators()->texture_format.IsValid(GL_SRGB_EXT));
     EXPECT_TRUE(info_->validators()->texture_format.IsValid(GL_SRGB_ALPHA_EXT));
     EXPECT_TRUE(
         info_->validators()->texture_internal_format.IsValid(GL_SRGB_EXT));
     EXPECT_TRUE(info_->validators()->texture_internal_format.IsValid(
         GL_SRGB_ALPHA_EXT));
     EXPECT_TRUE(
         info_->validators()->render_buffer_format.IsValid(GL_SRGB8_ALPHA8_EXT));
     EXPECT_TRUE(info_->validators()->framebuffer_parameter.IsValid(
         GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
@@ skipping 295 matching lines @@
   EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_OES_texture_float")));
   EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_OES_texture_half_float")));
   EXPECT_THAT(info_->extensions(),
               Not(HasSubstr("GL_OES_texture_float_linear")));
   EXPECT_THAT(info_->extensions(),
               Not(HasSubstr("GL_OES_texture_half_float_linear")));
 }
 
 TEST_P(FeatureInfoTest, Initialize_sRGBGLES3) {
   SetupInitExpectationsWithGLVersion("", "", "OpenGL ES 3.0");
-  EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_EXT_sRGB")));
+  EXPECT_THAT(info_->extensions() + " ", Not(HasSubstr("GL_EXT_sRGB ")));
   EXPECT_FALSE(info_->validators()->texture_format.IsValid(
       GL_SRGB_EXT));
   EXPECT_FALSE(info_->validators()->texture_format.IsValid(
       GL_SRGB_ALPHA_EXT));
   EXPECT_FALSE(info_->validators()->texture_internal_format.IsValid(
       GL_SRGB_EXT));
   EXPECT_FALSE(info_->validators()->texture_internal_format.IsValid(
       GL_SRGB_ALPHA_EXT));
   EXPECT_FALSE(info_->validators()->render_buffer_format.IsValid(
       GL_SRGB8_ALPHA8_EXT));
@@ skipping 723 matching lines @@
   EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(GL_RG8_EXT));
 }
 
 TEST_P(FeatureInfoTest, InitializeCHROMIUM_ycbcr_422_imageTrue) {
   SetupInitExpectations("GL_APPLE_ycbcr_422");
   EXPECT_TRUE(info_->feature_flags().chromium_image_ycbcr_422);
 }
 
 }  // namespace gles2
 }  // namespace gpu