Mark zero dimension textures as unrenderable

gpu/command_buffer/service/texture_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 
 #include <list>
 #include <string>
 #include <vector>
@@ skipping 121 matching lines @@
 
   void AttachToFramebuffer() {
     ++framebuffer_attachment_count_;
   }
 
   void DetachFromFramebuffer() {
     DCHECK_GT(framebuffer_attachment_count_, 0);
     --framebuffer_attachment_count_;
   }
 
-  void SetStreamTexture(bool stream_texture) {
-    stream_texture_ = stream_texture;
-  }
-
-  bool IsStreamTexture() {
+  bool IsStreamTexture() const {
     return stream_texture_;
   }
 
   gpu::AsyncPixelTransferState* GetAsyncTransferState() const {
     return async_transfer_state_.get();
   }
   void SetAsyncTransferState(scoped_ptr<gpu::AsyncPixelTransferState> state) {
     async_transfer_state_ = state.Pass();
   }
   bool AsyncTransferIsInProgress() {
     return async_transfer_state_ &&
         async_transfer_state_->TransferIsInProgress();
   }
 
   void SetImmutable(bool immutable) {
     immutable_ = immutable;
   }
 
-  bool IsImmutable() {
+  bool IsImmutable() const {
     return immutable_;
   }
 
   // Whether a particular level/face is cleared.
   bool IsLevelCleared(GLenum target, GLint level) const;
 
   // Whether the texture has been defined
-  bool IsDefined() {
+  bool IsDefined() const {
     return estimated_size() > 0;
   }
 
  private:
   friend class TextureManager;
   friend class TextureTestHelper;
   friend class base::RefCounted<Texture>;
 
   ~Texture();
 
@@ skipping 41 matching lines @@
   // same format, all the same dimensions and all width = height.
   bool cube_complete() const {
     return cube_complete_;
   }
 
   // Whether or not this texture is a non-power-of-two texture.
   bool npot() const {
     return npot_;
   }
 
+  void SetStreamTexture(bool stream_texture) {
+    stream_texture_ = stream_texture;
+  }
+
   // Marks a particular level as cleared or uncleared.
   void SetLevelCleared(GLenum target, GLint level, bool cleared);
 
   // Updates the cleared flag for this texture by inspecting all the mips.
   void UpdateCleared();
 
   // Clears any renderable uncleared levels.
   // Returns false if a GL error was generated.
   bool ClearRenderableLevels(GLES2Decoder* decoder);
 
@@ skipping 23 matching lines @@
   bool CanRender(const FeatureInfo* feature_info) const;
 
   // Returns true if mipmaps can be generated by GL.
   bool CanGenerateMipmaps(const FeatureInfo* feature_info) const;
 
   // Sets the Texture's target
   // Parameters:
   //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP or
   //           GL_TEXTURE_EXTERNAL_OES or GL_TEXTURE_RECTANGLE_ARB
   //   max_levels: The maximum levels this type of target can have.
-  void SetTarget(GLenum target, GLint max_levels);
+  void SetTarget(
+      const FeatureInfo* feature_info, GLenum target, GLint max_levels);
 
   // Update info about this texture.
   void Update(const FeatureInfo* feature_info);
 
   // Set the image for a particular level.
   void SetLevelImage(
       const FeatureInfo* feature_info,
       GLenum target,
       GLint level,
       gfx::GLImage* image);
@@ skipping 140 matching lines @@
   }
 
   // Sets the Texture's target
   // Parameters:
   //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP
   //   max_levels: The maximum levels this type of target can have.
   void SetTarget(
       Texture* texture,
       GLenum target);
 
+  // Marks a texture as a stream texture.
+  void SetStreamTexture(Texture* texture, bool stream_texture);
+
   // Set the info for a particular level in a TexureInfo.
   void SetLevelInfo(
       Texture* texture,
       GLenum target,
       GLint level,
       GLenum internal_format,
       GLsizei width,
       GLsizei height,
       GLsizei depth,
       GLint border,
@@ skipping 161 matching lines @@
   // The default textures for each target (texture name = 0)
   scoped_refptr<Texture> default_textures_[kNumDefaultTextures];
 
   DISALLOW_COPY_AND_ASSIGN(TextureManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_