Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/gui/painting/qdrawhelper.cpp
	src/plugins/platforms/xcb/qxcbnativeinterface.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/testlib/qtestblacklist.cpp
	src/tools/qdoc/node.cpp
	src/tools/qdoc/node.h
	tests/auto/gui/painting/qcolor/tst_qcolor.cpp

Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684

1 files changed, 144 insertions, 0 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/Framebuffer.h b/src/3rdparty/angle/src/libANGLE/Framebuffer.h
new file mode 100644
index 0000000000..8b24cf984e
--- /dev/null
+++ b/src/3rdparty/angle/src/libANGLE/Framebuffer.h
@@ -0,0 +1,144 @@
+//
+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// Framebuffer.h: Defines the gl::Framebuffer class. Implements GL framebuffer
+// objects and related functionality. [OpenGL ES 2.0.24] section 4.4 page 105.
+
+#ifndef LIBANGLE_FRAMEBUFFER_H_
+#define LIBANGLE_FRAMEBUFFER_H_
+
+#include <vector>
+
+#include "common/angleutils.h"
+#include "libANGLE/Constants.h"
+#include "libANGLE/Error.h"
+#include "libANGLE/RefCountObject.h"
+
+namespace rx
+{
+class ImplFactory;
+class FramebufferImpl;
+class RenderbufferImpl;
+struct Workarounds;
+}
+
+namespace egl
+{
+class Surface;
+}
+
+namespace gl
+{
+class FramebufferAttachment;
+class Renderbuffer;
+class State;
+class Texture;
+class TextureCapsMap;
+struct Caps;
+struct Data;
+struct Extensions;
+struct ImageIndex;
+struct Rectangle;
+
+typedef std::vector<FramebufferAttachment *> AttachmentList;
+
+class Framebuffer
+{
+  public:
+
+    class Data final : angle::NonCopyable
+    {
+      public:
+        explicit Data(const Caps &caps);
+        ~Data();
+
+        FramebufferAttachment *getReadAttachment() const;
+        FramebufferAttachment *getFirstColorAttachment() const;
+        FramebufferAttachment *getDepthOrStencilAttachment() const;
+
+        AttachmentList mColorAttachments;
+        FramebufferAttachment *mDepthAttachment;
+        FramebufferAttachment *mStencilAttachment;
+
+        std::vector<GLenum> mDrawBufferStates;
+        GLenum mReadBufferState;
+    };
+
+    Framebuffer(const Caps &caps, rx::ImplFactory *factory, GLuint id);
+    virtual ~Framebuffer();
+
+    const rx::FramebufferImpl *getImplementation() const { return mImpl; }
+    rx::FramebufferImpl *getImplementation() { return mImpl; }
+
+    GLuint id() const { return mId; }
+
+    void setTextureAttachment(GLenum attachment, Texture *texture, const ImageIndex &imageIndex);
+    void setRenderbufferAttachment(GLenum attachment, Renderbuffer *renderbuffer);
+    void setNULLAttachment(GLenum attachment);
+
+    void detachTexture(GLuint texture);
+    void detachRenderbuffer(GLuint renderbuffer);
+
+    FramebufferAttachment *getColorbuffer(unsigned int colorAttachment) const;
+    FramebufferAttachment *getDepthbuffer() const;
+    FramebufferAttachment *getStencilbuffer() const;
+    FramebufferAttachment *getDepthStencilBuffer() const;
+    FramebufferAttachment *getDepthOrStencilbuffer() const;
+    FramebufferAttachment *getReadColorbuffer() const;
+    GLenum getReadColorbufferType() const;
+    FramebufferAttachment *getFirstColorbuffer() const;
+
+    FramebufferAttachment *getAttachment(GLenum attachment) const;
+
+    GLenum getDrawBufferState(unsigned int colorAttachment) const;
+    void setDrawBuffers(size_t count, const GLenum *buffers);
+
+    GLenum getReadBufferState() const;
+    void setReadBuffer(GLenum buffer);
+
+    bool isEnabledColorAttachment(unsigned int colorAttachment) const;
+    bool hasEnabledColorAttachment() const;
+    bool hasStencil() const;
+    int getSamples(const gl::Data &data) const;
+    bool usingExtendedDrawBuffers() const;
+
+    GLenum checkStatus(const gl::Data &data) const;
+    bool hasValidDepthStencil() const;
+
+    Error invalidate(size_t count, const GLenum *attachments);
+    Error invalidateSub(size_t count, const GLenum *attachments, const gl::Rectangle &area);
+
+    Error clear(const gl::Data &data, GLbitfield mask);
+    Error clearBufferfv(const State &state, GLenum buffer, GLint drawbuffer, const GLfloat *values);
+    Error clearBufferuiv(const State &state, GLenum buffer, GLint drawbuffer, const GLuint *values);
+    Error clearBufferiv(const State &state, GLenum buffer, GLint drawbuffer, const GLint *values);
+    Error clearBufferfi(const State &state, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+
+    GLenum getImplementationColorReadFormat() const;
+    GLenum getImplementationColorReadType() const;
+    Error readPixels(const gl::State &state, const gl::Rectangle &area, GLenum format, GLenum type, GLvoid *pixels) const;
+
+    Error blit(const gl::State &state, const gl::Rectangle &sourceArea, const gl::Rectangle &destArea,
+               GLbitfield mask, GLenum filter, const gl::Framebuffer *sourceFramebuffer);
+
+  protected:
+    void setAttachment(GLenum attachment, FramebufferAttachment *attachmentObj);
+    void detachResourceById(GLenum resourceType, GLuint resourceId);
+
+    Data mData;
+    rx::FramebufferImpl *mImpl;
+    GLuint mId;
+};
+
+class DefaultFramebuffer : public Framebuffer
+{
+  public:
+    DefaultFramebuffer(const gl::Caps &caps, rx::ImplFactory *factory, egl::Surface *surface);
+};
+
+}
+
+#endif   // LIBANGLE_FRAMEBUFFER_H_