| Index: Source/core/html/canvas/WebGLFramebuffer.h
|
| diff --git a/Source/core/html/canvas/WebGLFramebuffer.h b/Source/core/html/canvas/WebGLFramebuffer.h
|
| index f15ae11db68379276210d8d5091a95b5b065b57c..e760c05a4d14e5d87c85a729471d50b47ee4b805 100644
|
| --- a/Source/core/html/canvas/WebGLFramebuffer.h
|
| +++ b/Source/core/html/canvas/WebGLFramebuffer.h
|
| @@ -55,8 +55,8 @@ public:
|
| virtual bool isSharedObject(WebGLSharedObject*) const = 0;
|
| virtual bool valid() const = 0;
|
| virtual void onDetached(WebGraphicsContext3D*) = 0;
|
| - virtual void attach(WebGraphicsContext3D*, GLenum attachment) = 0;
|
| - virtual void unattach(WebGraphicsContext3D*, GLenum attachment) = 0;
|
| + virtual void attach(WebGraphicsContext3D*, GLenum target, GLenum attachment) = 0;
|
| + virtual void unattach(WebGraphicsContext3D*, GLenum target, GLenum attachment) = 0;
|
|
|
| DEFINE_INLINE_VIRTUAL_TRACE() { }
|
|
|
| @@ -70,12 +70,12 @@ public:
|
|
|
| Platform3DObject object() const { return m_object; }
|
|
|
| - void setAttachmentForBoundFramebuffer(GLenum attachment, GLenum texTarget, WebGLTexture*, GLint level);
|
| - void setAttachmentForBoundFramebuffer(GLenum attachment, WebGLRenderbuffer*);
|
| + void setAttachmentForBoundFramebuffer(GLenum target, GLenum attachment, GLenum texTarget, WebGLTexture*, GLint level);
|
| + void setAttachmentForBoundFramebuffer(GLenum target, GLenum attachment, WebGLRenderbuffer*);
|
| // If an object is attached to the currently bound framebuffer, remove it.
|
| - void removeAttachmentFromBoundFramebuffer(WebGLSharedObject*);
|
| + void removeAttachmentFromBoundFramebuffer(GLenum target, WebGLSharedObject*);
|
| // If a given attachment point for the currently bound framebuffer is not null, remove the attached object.
|
| - void removeAttachmentFromBoundFramebuffer(GLenum);
|
| + void removeAttachmentFromBoundFramebuffer(GLenum target, GLenum attachment);
|
| WebGLSharedObject* getAttachmentObject(GLenum) const;
|
|
|
| GLenum colorBufferFormat() const;
|
| @@ -84,7 +84,7 @@ public:
|
| // readPixels, copyTexImage2D, copyTexSubImage2D if this framebuffer is
|
| // currently bound.
|
| // Return false if the framebuffer is incomplete.
|
| - bool onAccess(WebGraphicsContext3D*, const char** reason);
|
| + bool onAccess(WebGraphicsContext3D*, GLenum target, const char** reason);
|
|
|
| // Software version of glCheckFramebufferStatus(), except that when
|
| // FRAMEBUFFER_COMPLETE is returned, it is still possible for
|
| @@ -112,14 +112,14 @@ protected:
|
| void deleteObjectImpl(WebGraphicsContext3D*) override;
|
|
|
| private:
|
| - WebGLAttachment* getAttachment(GLenum) const;
|
| + WebGLAttachment* getAttachment(GLenum attachment) const;
|
| bool isAttachmentComplete(WebGLAttachment* attachedObject, GLenum attachment, const char** reason) const;
|
|
|
| // Check if the framebuffer is currently bound.
|
| bool isBound() const;
|
|
|
| // attach 'attachment' at 'attachmentPoint'.
|
| - void attach(GLenum attachment, GLenum attachmentPoint);
|
| + void attach(GLenum target, GLenum attachment, GLenum attachmentPoint);
|
|
|
| // Check if a new drawBuffers call should be issued. This is called when we add or remove an attachment.
|
| void drawBuffersIfNecessary(bool force);
|
|
|