Fixes for the default texture....

gpu/command_buffer/service/texture_manager.h

 // Copyright (c) 2010 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 <map>
 #include <vector>
 #include "base/basictypes.h"
@@ skipping 199 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(TextureInfo);
   };
 
   TextureManager(bool npot_ok,
                  bool enable_float_linear,
                  bool enable_half_float_linear,
                  GLsizei max_texture_size,
                  GLsizei max_cube_map_texture_size);
   ~TextureManager();
 
+  // Init the texture manager.
+  bool Initialize();
+
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Whether or not npot textures can render.
   bool npot_ok() const {
     return npot_ok_;
   }
 
   // Whether float textures can have linear filtering.
   bool enable_float_linear() const {
@@ skipping 65 matching lines @@
 
   TextureInfo* GetDefaultTextureInfo(GLenum target) {
     return target == GL_TEXTURE_2D ? default_texture_2d_ :
                                      default_texture_cube_map_;
   }
 
   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_;
+  }
+
  private:
   // Info for each texture in the system.
   // TODO(gman): Choose a faster container.
   typedef std::map<GLuint, TextureInfo::Ref> TextureInfoMap;
   TextureInfoMap texture_infos_;
 
   bool npot_ok_;
   bool enable_float_linear_;
   bool enable_half_float_linear_;
   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_;
+
   // The default textures for each target (texture name = 0)
   TextureInfo::Ref default_texture_2d_;
   TextureInfo::Ref default_texture_cube_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_