Support GL_OES_EGL_image_external

gpu/command_buffer/service/texture_manager.h

 // Copyright (c) 2011 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
@@ skipping 188 matching lines @@
       service_id_ = 0;
       deleted_ = true;
     }
 
     bool NeedsMips() const {
       return min_filter_ != GL_NEAREST && min_filter_ != GL_LINEAR;
     }
 
     // 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);
       }
     }
 
     // Update info about this texture.
     void Update(const FeatureInfo* feature_info);
 
     // Info about each face and level of texture.
@@ skipping 37 matching lines @@
     bool owned_;
 
     DISALLOW_COPY_AND_ASSIGN(TextureInfo);
   };
 
   TextureManager(GLsizei max_texture_size,
                  GLsizei max_cube_map_texture_size);
   ~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.
   bool ValidForTarget(
       const FeatureInfo* feature_info,
       GLenum target, GLint level,
       GLsizei width, GLsizei height, GLsizei depth);
 
   // Sets the TextureInfo's target
   // Parameters:
@@ skipping 37 matching lines @@
   // Gets the texture info for the given texture.
   TextureInfo* GetTextureInfo(GLuint client_id);
 
   // Removes a texture info.
   void RemoveTextureInfo(const FeatureInfo* feature_info, GLuint client_id);
 
   // Gets a client id for a given service id.
   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 {
     return num_unrenderable_textures_ > 0;
   }
 
   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:
   // Info for each texture in the system.
   typedef base::hash_map<GLuint, TextureInfo::Ref> TextureInfoMap;
   TextureInfoMap texture_infos_;
 
   GLsizei max_texture_size_;
   GLsizei max_cube_map_texture_size_;
   GLint max_levels_;
   GLint max_cube_map_levels_;
 
   int num_unrenderable_textures_;
 
   // Black (0,0,0,1) textures for when non-renderable textures are used.
   // NOTE: There is no corresponding TextureInfo for these textures.
   // 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);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_