Create correct GLES3 context for GLES3 unittest

gpu/command_buffer/service/test_helper.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/test_helper.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 328 matching lines @@
     const DisallowedFeatures& disallowed_features,
     const char* extensions,
     const char* gl_version,
     ContextType context_type,
     bool bind_generates_resource) {
   InSequence sequence;
 
   gl::GLVersionInfo gl_info(gl_version, "", extensions);
 
   SetupFeatureInfoInitExpectationsWithGLVersion(gl, extensions, "", gl_version,
-      context_type,
       context_type == CONTEXT_TYPE_WEBGL2 ||
       context_type == CONTEXT_TYPE_OPENGLES3);
 
   EXPECT_CALL(*gl, GetIntegerv(GL_MAX_RENDERBUFFER_SIZE, _))
       .WillOnce(SetArgumentPointee<1>(kMaxRenderbufferSize))
       .RetiresOnSaturation();
   if (strstr(extensions, "GL_EXT_framebuffer_multisample") ||
       strstr(extensions, "GL_EXT_multisampled_render_to_texture") ||
       gl_info.is_es3 || gl_info.is_desktop_core_profile) {
     EXPECT_CALL(*gl, GetIntegerv(GL_MAX_SAMPLES, _))
@@ skipping 113 matching lines @@
       .RetiresOnSaturation();
 
   bool use_default_textures = bind_generates_resource;
   SetupTextureManagerInitExpectations(
       gl, false, gl_info.is_es3_capable, gl_info.is_desktop_core_profile,
       extensions, use_default_textures);
 }
 
 void TestHelper::SetupFeatureInfoInitExpectations(::gl::MockGLInterface* gl,
                                                   const char* extensions) {
-  SetupFeatureInfoInitExpectationsWithGLVersion(gl, extensions, "", "",
-      CONTEXT_TYPE_OPENGLES2);
+  SetupFeatureInfoInitExpectationsWithGLVersion(gl, extensions, "", "");
 }
 
 void TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
     ::gl::MockGLInterface* gl,
     const char* extensions,
     const char* gl_renderer,
     const char* gl_version,
-    ContextType context_type,
     bool enable_es3) {
   InSequence sequence;
 
   EXPECT_CALL(*gl, GetString(GL_VERSION))
       .WillOnce(Return(reinterpret_cast<const uint8_t*>(gl_version)))
       .RetiresOnSaturation();
 
   // Persistent storage is needed for the split extension string.
   split_extensions_.clear();
   if (extensions) {
@@ skipping 18 matching lines @@
         .RetiresOnSaturation();
   }
 
   EXPECT_CALL(*gl, GetString(GL_VERSION))
       .WillOnce(Return(reinterpret_cast<const uint8_t*>(gl_version)))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl, GetString(GL_RENDERER))
       .WillOnce(Return(reinterpret_cast<const uint8_t*>(gl_renderer)))
       .RetiresOnSaturation();
 
-  if (!(context_type == CONTEXT_TYPE_WEBGL1 ||
-        context_type == CONTEXT_TYPE_OPENGLES2) &&
-      gl_info.is_es3_capable && enable_es3) {
+  if (gl_info.is_es3_capable && enable_es3) {
     EXPECT_CALL(*gl, GetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, _))
       .WillOnce(SetArgPointee<1>(0))
       .RetiresOnSaturation();
   }
 
   if ((strstr(extensions, "GL_ARB_texture_float") ||
        gl_info.is_desktop_core_profile) ||
       (gl_info.is_es3 && strstr(extensions, "GL_EXT_color_buffer_float"))) {
     static const GLuint tx_ids[] = {101, 102};
     static const GLuint fb_ids[] = {103, 104};
@@ skipping 24 matching lines @@
     EXPECT_CALL(*gl, BindFramebufferEXT(GL_FRAMEBUFFER, fb_ids[1]))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl, FramebufferTexture2DEXT(GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tx_ids[1], 0))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
         .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
         .RetiresOnSaturation();
+    GLenum status_rgba = GL_FRAMEBUFFER_COMPLETE;
     EXPECT_CALL(*gl, TexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, width, width, 0,
         GL_RGB, GL_FLOAT, _))
         .Times(1)
         .RetiresOnSaturation();
     if (gl_info.is_es3) {
       EXPECT_CALL(*gl, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
           .WillOnce(Return(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT))
           .RetiresOnSaturation();
     } else {
       EXPECT_CALL(*gl, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
           .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
           .RetiresOnSaturation();
+    }
 
+    if (status_rgba == GL_FRAMEBUFFER_COMPLETE) {
       if (enable_es3 && gl_info.is_es3_capable) {
         EXPECT_CALL(*gl, TexImage2D(GL_TEXTURE_2D, 0, GL_R16F, width, width,
             0, GL_RED, GL_FLOAT, _))
             .Times(1)
             .RetiresOnSaturation();
         EXPECT_CALL(*gl, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
             .Times(1)
             .RetiresOnSaturation();
         EXPECT_CALL(*gl, TexImage2D(GL_TEXTURE_2D, 0, GL_RG16F, width, width,
             0, GL_RG, GL_FLOAT, _))
@@ skipping 601 matching lines @@
     GLenum precision,
     bool static_use,
     const std::string& name) {
   return ConstructShaderVariable<sh::OutputVariable>(
       type, array_size, precision, static_use, name);
 }
 
 }  // namespace gles2
 }  // namespace gpu