| 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 cbc659caf4e08a5fe11102925d92b002cfe2f5b1..2f007cf0cad0eb74877217b7e239f2059e0951c7 100644
|
| --- a/gpu/command_buffer/service/texture_manager.h
|
| +++ b/gpu/command_buffer/service/texture_manager.h
|
| @@ -22,8 +22,6 @@
|
|
|
| namespace gpu {
|
|
|
| -class StreamTextureManager;
|
| -
|
| namespace gles2 {
|
|
|
| class GLES2Decoder;
|
| @@ -75,7 +73,7 @@ class GPU_EXPORT Texture {
|
| }
|
|
|
| bool CanRenderTo() const {
|
| - return !stream_texture_ && target_ != GL_TEXTURE_EXTERNAL_OES;
|
| + return target_ != GL_TEXTURE_EXTERNAL_OES;
|
| }
|
|
|
| // The service side OpenGL id of the texture.
|
| @@ -141,10 +139,6 @@ class GPU_EXPORT Texture {
|
| --framebuffer_attachment_count_;
|
| }
|
|
|
| - bool IsStreamTexture() const {
|
| - return stream_texture_;
|
| - }
|
| -
|
| void SetImmutable(bool immutable) {
|
| immutable_ = immutable;
|
| }
|
| @@ -236,11 +230,6 @@ class GPU_EXPORT Texture {
|
| return npot_;
|
| }
|
|
|
| - void SetStreamTexture(bool stream_texture) {
|
| - stream_texture_ = stream_texture;
|
| - UpdateCanRenderCondition();
|
| - }
|
| -
|
| // Marks a particular level as cleared or uncleared.
|
| void SetLevelCleared(GLenum target, GLint level, bool cleared);
|
|
|
| @@ -369,9 +358,6 @@ class GPU_EXPORT Texture {
|
| // The number of framebuffers this texture is attached to.
|
| int framebuffer_attachment_count_;
|
|
|
| - // Whether this is a special streaming texture.
|
| - bool stream_texture_;
|
| -
|
| // Whether the texture is immutable and no further changes to the format
|
| // or dimensions of the texture object can be made.
|
| bool immutable_;
|
| @@ -416,15 +402,10 @@ class GPU_EXPORT TextureRef : public base::RefCounted<TextureRef> {
|
| const TextureManager* manager() const { return manager_; }
|
| TextureManager* manager() { return manager_; }
|
| void reset_client_id() { client_id_ = 0; }
|
| - void set_is_stream_texture_owner(bool owner) {
|
| - is_stream_texture_owner_ = owner;
|
| - }
|
| - bool is_stream_texture_owner() const { return is_stream_texture_owner_; }
|
|
|
| TextureManager* manager_;
|
| Texture* texture_;
|
| GLuint client_id_;
|
| - bool is_stream_texture_owner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TextureRef);
|
| };
|
| @@ -469,10 +450,6 @@ class GPU_EXPORT TextureManager {
|
| framebuffer_manager_ = manager;
|
| }
|
|
|
| - void set_stream_texture_manager(StreamTextureManager* manager) {
|
| - stream_texture_manager_ = manager;
|
| - }
|
| -
|
| // Init the texture manager.
|
| bool Initialize();
|
|
|
| @@ -530,13 +507,6 @@ class GPU_EXPORT TextureManager {
|
| TextureRef* ref,
|
| GLenum target);
|
|
|
| - // Marks a texture as a stream texture, and the ref as the stream texture
|
| - // owner.
|
| - void SetStreamTexture(TextureRef* ref, bool stream_texture);
|
| -
|
| - // Whether the TextureRef is the stream texture owner.
|
| - bool IsStreamTextureOwner(TextureRef* ref);
|
| -
|
| // Set the info for a particular level in a TexureInfo.
|
| void SetLevelInfo(
|
| TextureRef* ref,
|
| @@ -696,7 +666,6 @@ class GPU_EXPORT TextureManager {
|
| scoped_refptr<FeatureInfo> feature_info_;
|
|
|
| FramebufferManager* framebuffer_manager_;
|
| - StreamTextureManager* stream_texture_manager_;
|
|
|
| // Info for each texture in the system.
|
| typedef base::hash_map<GLuint, scoped_refptr<TextureRef> > TextureMap;
|
|
|