Support GL_OES_EGL_image_external

gpu/command_buffer/service/texture_manager.h

Index: gpu/command_buffer/service/texture_manager.h
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index 2fc1cb9d381b588ca3191bfd8e905de34c8bd9a0..264402c2b576449f6e236d6758c2c14a5487bd7c 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -206,12 +206,13 @@ class TextureManager {
 
     // Sets the TextureInfo's target
     // Parameters:
-    //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP
+    //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP or
+    //           GL_TEXTURE_EXTERNAL_OES
     //   max_levels: The maximum levels this type of target can have.
     void SetTarget(GLenum target, GLint max_levels) {
       DCHECK_EQ(0u, target_);  // you can only set this once.
       target_ = target;
-      size_t num_faces = (target == GL_TEXTURE_2D) ? 1 : 6;
+      size_t num_faces = (target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
       level_infos_.resize(num_faces);
       for (size_t ii = 0; ii < num_faces; ++ii) {
         level_infos_[ii].resize(max_levels);
@@ -269,20 +270,32 @@ class TextureManager {
   ~TextureManager();
 
   // Init the texture manager.
-  bool Initialize();
+  bool Initialize(const FeatureInfo* feature_info);
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Returns the maximum number of levels.
   GLint MaxLevelsForTarget(GLenum target) const {
-    return (target == GL_TEXTURE_2D) ? max_levels_ : max_cube_map_levels_;
+    switch (target) {
+      case GL_TEXTURE_2D:

[greggman, 2011/07/20 01:41:18]

What about if this and the next function had all 3 cases and a 

default:
  NOTREACHED()
  return 0;
}

?

[no sievers, 2011/07/20 23:00:37]

I originally had it that way but it broke stuff, because this gets also called
from e.g. DoCopyTexImage2D() -> ValidForTarget() where the target is a cubemap
face (so it really has 9 valid cases here).

I added the corresponding testcases in (TextureManagerTest, MaxValues) in
texture_manager_unittest.cc.

On 2011/07/20 01:41:18, greggman wrote:

+        return  max_levels_;
+      case GL_TEXTURE_EXTERNAL_OES:
+        return 1;
+      default:
+        return max_cube_map_levels_;
+    }
   }
 
   // Returns the maximum size.
   GLsizei MaxSizeForTarget(GLenum target) const {
-    return (target == GL_TEXTURE_2D) ? max_texture_size_ :
-                                       max_cube_map_texture_size_;
+    switch (target) {
+      case GL_TEXTURE_2D:
+      case GL_TEXTURE_EXTERNAL_OES:
+        return max_texture_size_;
+      default:
+        return max_cube_map_texture_size_;
+    }
   }
 
   // Checks if a dimensions are valid for a given target.
@@ -340,8 +353,17 @@ class TextureManager {
   bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
   TextureInfo* GetDefaultTextureInfo(GLenum target) {
-    return target == GL_TEXTURE_2D ? default_texture_2d_ :
-                                     default_texture_cube_map_;
+    switch (target) {
+      case GL_TEXTURE_2D:
+        return default_texture_2d_;
+      case GL_TEXTURE_CUBE_MAP:
+        return default_texture_cube_map_;
+      case GL_TEXTURE_EXTERNAL_OES:
+        return default_texture_external_oes_;
+      default:
+        NOTREACHED();
+        return NULL;
+    }
   }
 
   bool HaveUnrenderableTextures() const {
@@ -349,8 +371,17 @@ class TextureManager {
   }
 
   GLuint black_texture_id(GLenum target) const {
-    return target == GL_SAMPLER_2D ? black_2d_texture_id_ :
-                                     black_cube_texture_id_;
+    switch (target) {
+      case GL_SAMPLER_2D:
+        return black_2d_texture_id_;
+      case GL_SAMPLER_CUBE:
+        return black_cube_texture_id_;
+      case GL_SAMPLER_EXTERNAL_OES:
+        return black_oes_external_texture_id_;
+      default:
+        NOTREACHED();
+        return 0;
+    }
   }
 
  private:
@@ -370,10 +401,12 @@ class TextureManager {
   // TextureInfos are only for textures the client side can access.
   GLuint black_2d_texture_id_;
   GLuint black_cube_texture_id_;
+  GLuint black_oes_external_texture_id_;
 
   // The default textures for each target (texture name = 0)
   TextureInfo::Ref default_texture_2d_;
   TextureInfo::Ref default_texture_cube_map_;
+  TextureInfo::Ref default_texture_external_oes_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureManager);
 };