Revert 89002 - Enforce RGB even on buggy drivers.

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 24 matching lines @@
           target_(0),
           min_filter_(GL_NEAREST_MIPMAP_LINEAR),
           mag_filter_(GL_LINEAR),
           wrap_s_(GL_REPEAT),
           wrap_t_(GL_REPEAT),
           max_level_set_(-1),
           texture_complete_(false),
           cube_complete_(false),
           npot_(false),
           has_been_bound_(false),
-          framebuffer_attachment_count_(0),
           owned_(true) {
     }
 
     GLenum min_filter() const {
       return min_filter_;
     }
 
     GLenum mag_filter() const {
       return mag_filter_;
     }
@@ skipping 69 matching lines @@
         GLenum type) const;
 
     bool IsValid() const {
       return target() && !IsDeleted();
     }
 
     void SetNotOwned() {
       owned_ = false;
     }
 
-    bool IsAttachedToFramebuffer() const {
-      return framebuffer_attachment_count_ != 0;
-    }
-
-    void AttachToFramebuffer() {
-      ++framebuffer_attachment_count_;
-    }
-
-    void DetachFromFramebuffer() {
-      DCHECK(framebuffer_attachment_count_ > 0);
-      --framebuffer_attachment_count_;
-    }
-
    private:
     friend class TextureManager;
     friend class base::RefCounted<TextureInfo>;
 
     ~TextureInfo() { }
 
     struct LevelInfo {
       LevelInfo()
          : valid(false),
            internal_format(0),
@@ skipping 89 matching lines @@
 
     // Whether or not this texture is "cube complete"
     bool cube_complete_;
 
     // Whether or not this texture is non-power-of-two
     bool npot_;
 
     // Whether this texture has ever been bound.
     bool has_been_bound_;
 
-    // The number of framebuffers this texture is attached to.
-    int framebuffer_attachment_count_;
-
     // Whether the associated context group owns this texture and should delete
     // it.
     bool owned_;
 
     DISALLOW_COPY_AND_ASSIGN(TextureInfo);
   };
 
   TextureManager(GLsizei max_texture_size,
                  GLsizei max_cube_map_texture_size);
   ~TextureManager();
@@ skipping 105 matching lines @@
   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_