| Index: gpu/command_buffer/service/framebuffer_manager.h
|
| diff --git a/gpu/command_buffer/service/framebuffer_manager.h b/gpu/command_buffer/service/framebuffer_manager.h
|
| index e5962f7236da53e6373ea1a49269addc3f781d85..eab5809d63145562acb0564d46d59c61a454ad40 100644
|
| --- a/gpu/command_buffer/service/framebuffer_manager.h
|
| +++ b/gpu/command_buffer/service/framebuffer_manager.h
|
| @@ -63,7 +63,6 @@ class GPU_EXPORT Framebuffer : public base::RefCounted<Framebuffer> {
|
| virtual bool CanRenderTo(const FeatureInfo* feature_info) const = 0;
|
| virtual void DetachFromFramebuffer(Framebuffer* framebuffer) const = 0;
|
| virtual bool ValidForAttachmentType(GLenum attachment_type,
|
| - ContextType context_type,
|
| uint32_t max_color_attachments) = 0;
|
| virtual size_t GetSignatureSize(TextureManager* texture_manager) const = 0;
|
| virtual void AddToSignature(
|
| @@ -151,12 +150,6 @@ class GPU_EXPORT Framebuffer : public base::RefCounted<Framebuffer> {
|
| bool HasColorAttachment(int index) const;
|
| bool HasDepthAttachment() const;
|
| bool HasStencilAttachment() const;
|
| - // The following look at DEPTH_STENCIL_ATTACHMENT or
|
| - // DEPTH_ATTACHMENT/STENCIL_ATTACHMENT.
|
| - // TODO(piman): DEPTH_STENCIL_ATTACHMENT is not a real attachment point,
|
| - // except for WebGL1. Fix this. http://crbug.com/630568
|
| - const Attachment* GetDepthAttachment() const;
|
| - const Attachment* GetStencilAttachment() const;
|
| GLenum GetDepthFormat() const;
|
| GLenum GetStencilFormat() const;
|
| GLenum GetDrawBufferInternalFormat() const;
|
| @@ -316,7 +309,6 @@ class GPU_EXPORT FramebufferManager {
|
| public:
|
| FramebufferManager(uint32_t max_draw_buffers,
|
| uint32_t max_color_attachments,
|
| - ContextType context_type,
|
| const scoped_refptr<FramebufferCompletenessCache>&
|
| framebuffer_combo_complete_cache);
|
| ~FramebufferManager();
|
| @@ -351,8 +343,6 @@ class GPU_EXPORT FramebufferManager {
|
| (framebuffer_state_change_count_ + 1) | 0x80000000U;
|
| }
|
|
|
| - ContextType context_type() const { return context_type_; }
|
| -
|
| private:
|
| friend class Framebuffer;
|
|
|
| @@ -381,8 +371,6 @@ class GPU_EXPORT FramebufferManager {
|
| uint32_t max_draw_buffers_;
|
| uint32_t max_color_attachments_;
|
|
|
| - ContextType context_type_;
|
| -
|
| scoped_refptr<FramebufferCompletenessCache> framebuffer_combo_complete_cache_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FramebufferManager);
|
|
|