Remove ANGLE

This marks the end of EGL and OpenGL ES support on Windows.

The concepts of -opengl dynamic, -opengl desktop, QT_OPENGL=software,
etc. remain unchanged, with the exception of the disapperance of
everything ANGLE related.

CMake builds now work identically to qmake on Windows: they default to
'dynamic' OpenGL on Windows, unless -DINPUT_opengl=desktop is specified.

On Windows, Qt 6 is expected to default to the "dynamic" OpenGL model by
default, just like Qt 5.15. This can be changed by switching to "desktop"
OpenGL, which will link to opengl32 (publicly, so other libs and applications
will do so as well) and disallows using another OpenGL DLL.

The "dynamic" mode is essential still because the fallback to a software
rasterizer, such as the opengl32sw.dll we ship with the Qt packages,
has to to work exactly like in Qt 5, the removal of ANGLE does not
change this concept in any way (except of course that the middle option
of using ANGLE is now gone)

When it comes to the windows plugin's OpenGL blacklist feature, it works
like before and accepts the ANGLE/D3D related keywords. They will
then be ignored. Similarly, requesting QT_OPENGL=angle is ignored (but
will show a warning).

The D3D11 and DXGI configure time tests are removed: Qt 5.14 already
depends on D3D 11.1 and DXGI 1.3 headers being available unconditionally
on Win32 (in QRhi's D3D11 backend). No need to test for these.

[ChangeLog][Windows] ANGLE is no longer included with Qt. Dynamic OpenGL
builds work like before but ANGLE is no longer an option. OpenGL proper
or an alternative opengl32 implementation are the two remaining options
now. Attempting to set QT_OPENGL=angle or Qt::AA_UseOpenGLES will have
no effect on Windows.

Fixes: QTBUG-79103
Change-Id: Ia404e0d07f3fe191b27434d863c81180112ecb3b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

1 files changed, 0 insertions, 389 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/Framebuffer.h b/src/3rdparty/angle/src/libANGLE/Framebuffer.h
deleted file mode 100644
index 70223f0bc7..0000000000
--- a/src/3rdparty/angle/src/libANGLE/Framebuffer.h
+++ /dev/null
@@ -1,389 +0,0 @@
-//
-// 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/Optional.h"
-#include "common/angleutils.h"
-#include "libANGLE/Constants.h"
-#include "libANGLE/Debug.h"
-#include "libANGLE/Error.h"
-#include "libANGLE/FramebufferAttachment.h"
-#include "libANGLE/RefCountObject.h"
-#include "libANGLE/signal_utils.h"
-
-namespace rx
-{
-class GLImplFactory;
-class FramebufferImpl;
-class RenderbufferImpl;
-class SurfaceImpl;
-}
-
-namespace egl
-{
-class Display;
-class Surface;
-}
-
-namespace gl
-{
-class Context;
-class ContextState;
-class Framebuffer;
-class Renderbuffer;
-class State;
-class Texture;
-class TextureCapsMap;
-class ValidationContext;
-struct Caps;
-struct Extensions;
-struct ImageIndex;
-struct Rectangle;
-
-class FramebufferState final : angle::NonCopyable
-{
-  public:
-    FramebufferState();
-    explicit FramebufferState(const Caps &caps);
-    ~FramebufferState();
-
-    const std::string &getLabel();
-    size_t getReadIndex() const;
-
-    const FramebufferAttachment *getAttachment(GLenum attachment) const;
-    const FramebufferAttachment *getReadAttachment() const;
-    const FramebufferAttachment *getFirstNonNullAttachment() const;
-    const FramebufferAttachment *getFirstColorAttachment() const;
-    const FramebufferAttachment *getDepthOrStencilAttachment() const;
-    const FramebufferAttachment *getStencilOrDepthStencilAttachment() const;
-    const FramebufferAttachment *getColorAttachment(size_t colorAttachment) const;
-    const FramebufferAttachment *getDepthAttachment() const;
-    const FramebufferAttachment *getStencilAttachment() const;
-    const FramebufferAttachment *getDepthStencilAttachment() const;
-
-    const std::vector<GLenum> &getDrawBufferStates() const { return mDrawBufferStates; }
-    DrawBufferMask getEnabledDrawBuffers() const { return mEnabledDrawBuffers; }
-    GLenum getReadBufferState() const { return mReadBufferState; }
-    const std::vector<FramebufferAttachment> &getColorAttachments() const
-    {
-        return mColorAttachments;
-    }
-
-    bool attachmentsHaveSameDimensions() const;
-    bool colorAttachmentsAreUniqueImages() const;
-    Box getDimensions() const;
-
-    const FramebufferAttachment *getDrawBuffer(size_t drawBufferIdx) const;
-    size_t getDrawBufferCount() const;
-
-    GLint getDefaultWidth() const { return mDefaultWidth; };
-    GLint getDefaultHeight() const { return mDefaultHeight; };
-    GLint getDefaultSamples() const { return mDefaultSamples; };
-    bool getDefaultFixedSampleLocations() const { return mDefaultFixedSampleLocations; };
-
-    bool hasDepth() const;
-    bool hasStencil() const;
-
-    GLenum getMultiviewLayout() const;
-    GLsizei getNumViews() const;
-    const std::vector<Offset> *getViewportOffsets() const;
-    GLint getBaseViewIndex() const;
-
-  private:
-    friend class Framebuffer;
-
-    std::string mLabel;
-
-    std::vector<FramebufferAttachment> mColorAttachments;
-    FramebufferAttachment mDepthAttachment;
-    FramebufferAttachment mStencilAttachment;
-
-    std::vector<GLenum> mDrawBufferStates;
-    GLenum mReadBufferState;
-    DrawBufferMask mEnabledDrawBuffers;
-
-    GLint mDefaultWidth;
-    GLint mDefaultHeight;
-    GLint mDefaultSamples;
-    bool mDefaultFixedSampleLocations;
-
-    // It's necessary to store all this extra state so we can restore attachments
-    // when DEPTH_STENCIL/DEPTH/STENCIL is unbound in WebGL 1.
-    FramebufferAttachment mWebGLDepthStencilAttachment;
-    FramebufferAttachment mWebGLDepthAttachment;
-    FramebufferAttachment mWebGLStencilAttachment;
-    bool mWebGLDepthStencilConsistent;
-
-    // Tracks if we need to initialize the resources for each attachment.
-    angle::BitSet<IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS + 2> mResourceNeedsInit;
-};
-
-class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
-{
-  public:
-    // Constructor to build application-defined framebuffers
-    Framebuffer(const Caps &caps, rx::GLImplFactory *factory, GLuint id);
-    // Constructor to build default framebuffers for a surface
-    Framebuffer(const egl::Display *display, egl::Surface *surface);
-    // Constructor to build a fake default framebuffer when surfaceless
-    Framebuffer(rx::GLImplFactory *factory);
-
-    ~Framebuffer() override;
-    void onDestroy(const Context *context);
-    void destroyDefault(const egl::Display *display);
-
-    void setLabel(const std::string &label) override;
-    const std::string &getLabel() const override;
-
-    rx::FramebufferImpl *getImplementation() const { return mImpl; }
-
-    GLuint id() const { return mId; }
-
-    void setAttachment(const Context *context,
-                       GLenum type,
-                       GLenum binding,
-                       const ImageIndex &textureIndex,
-                       FramebufferAttachmentObject *resource);
-    void setAttachmentMultiviewLayered(const Context *context,
-                                       GLenum type,
-                                       GLenum binding,
-                                       const ImageIndex &textureIndex,
-                                       FramebufferAttachmentObject *resource,
-                                       GLsizei numViews,
-                                       GLint baseViewIndex);
-    void setAttachmentMultiviewSideBySide(const Context *context,
-                                          GLenum type,
-                                          GLenum binding,
-                                          const ImageIndex &textureIndex,
-                                          FramebufferAttachmentObject *resource,
-                                          GLsizei numViews,
-                                          const GLint *viewportOffsets);
-    void resetAttachment(const Context *context, GLenum binding);
-
-    bool detachTexture(const Context *context, GLuint texture);
-    bool detachRenderbuffer(const Context *context, GLuint renderbuffer);
-
-    const FramebufferAttachment *getColorbuffer(size_t colorAttachment) const;
-    const FramebufferAttachment *getDepthbuffer() const;
-    const FramebufferAttachment *getStencilbuffer() const;
-    const FramebufferAttachment *getDepthStencilBuffer() const;
-    const FramebufferAttachment *getDepthOrStencilbuffer() const;
-    const FramebufferAttachment *getStencilOrDepthStencilAttachment() const;
-    const FramebufferAttachment *getReadColorbuffer() const;
-    GLenum getReadColorbufferType() const;
-    const FramebufferAttachment *getFirstColorbuffer() const;
-    const FramebufferAttachment *getFirstNonNullAttachment() const;
-
-    const FramebufferAttachment *getAttachment(GLenum attachment) const;
-    GLenum getMultiviewLayout() const;
-    GLsizei getNumViews() const;
-    GLint getBaseViewIndex() const;
-    const std::vector<Offset> *getViewportOffsets() const;
-
-    size_t getDrawbufferStateCount() const;
-    GLenum getDrawBufferState(size_t drawBuffer) const;
-    const std::vector<GLenum> &getDrawBufferStates() const;
-    void setDrawBuffers(size_t count, const GLenum *buffers);
-    const FramebufferAttachment *getDrawBuffer(size_t drawBuffer) const;
-    GLenum getDrawbufferWriteType(size_t drawBuffer) const;
-    bool hasEnabledDrawBuffer() const;
-
-    GLenum getReadBufferState() const;
-    void setReadBuffer(GLenum buffer);
-
-    size_t getNumColorBuffers() const;
-    bool hasDepth() const;
-    bool hasStencil() const;
-
-    bool usingExtendedDrawBuffers() const;
-
-    // This method calls checkStatus.
-    int getSamples(const Context *context);
-
-    Error getSamplePosition(size_t index, GLfloat *xy) const;
-
-    GLint getDefaultWidth() const;
-    GLint getDefaultHeight() const;
-    GLint getDefaultSamples() const;
-    bool getDefaultFixedSampleLocations() const;
-    void setDefaultWidth(GLint defaultWidth);
-    void setDefaultHeight(GLint defaultHeight);
-    void setDefaultSamples(GLint defaultSamples);
-    void setDefaultFixedSampleLocations(bool defaultFixedSampleLocations);
-
-    void invalidateCompletenessCache();
-
-    GLenum checkStatus(const Context *context);
-
-    // TODO(jmadill): Remove this kludge.
-    GLenum checkStatus(const ValidationContext *context);
-    int getSamples(const ValidationContext *context);
-
-    // For when we don't want to check completeness in getSamples().
-    int getCachedSamples(const Context *context);
-
-    // Helper for checkStatus == GL_FRAMEBUFFER_COMPLETE.
-    bool complete(const Context *context);
-    bool cachedComplete() const;
-
-    bool hasValidDepthStencil() const;
-
-    Error discard(const Context *context, size_t count, const GLenum *attachments);
-    Error invalidate(const Context *context, size_t count, const GLenum *attachments);
-    Error invalidateSub(const Context *context,
-                        size_t count,
-                        const GLenum *attachments,
-                        const gl::Rectangle &area);
-
-    Error clear(const gl::Context *context, GLbitfield mask);
-    Error clearBufferfv(const gl::Context *context,
-                        GLenum buffer,
-                        GLint drawbuffer,
-                        const GLfloat *values);
-    Error clearBufferuiv(const gl::Context *context,
-                         GLenum buffer,
-                         GLint drawbuffer,
-                         const GLuint *values);
-    Error clearBufferiv(const gl::Context *context,
-                        GLenum buffer,
-                        GLint drawbuffer,
-                        const GLint *values);
-    Error clearBufferfi(const gl::Context *context,
-                        GLenum buffer,
-                        GLint drawbuffer,
-                        GLfloat depth,
-                        GLint stencil);
-
-    GLenum getImplementationColorReadFormat(const Context *context) const;
-    GLenum getImplementationColorReadType(const Context *context) const;
-    Error readPixels(const gl::Context *context,
-                     const gl::Rectangle &area,
-                     GLenum format,
-                     GLenum type,
-                     void *pixels);
-
-    Error blit(const gl::Context *context,
-               const Rectangle &sourceArea,
-               const Rectangle &destArea,
-               GLbitfield mask,
-               GLenum filter);
-
-    enum DirtyBitType : size_t
-    {
-        DIRTY_BIT_COLOR_ATTACHMENT_0,
-        DIRTY_BIT_COLOR_ATTACHMENT_MAX =
-            DIRTY_BIT_COLOR_ATTACHMENT_0 + gl::IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS,
-        DIRTY_BIT_DEPTH_ATTACHMENT = DIRTY_BIT_COLOR_ATTACHMENT_MAX,
-        DIRTY_BIT_STENCIL_ATTACHMENT,
-        DIRTY_BIT_DRAW_BUFFERS,
-        DIRTY_BIT_READ_BUFFER,
-        DIRTY_BIT_DEFAULT_WIDTH,
-        DIRTY_BIT_DEFAULT_HEIGHT,
-        DIRTY_BIT_DEFAULT_SAMPLES,
-        DIRTY_BIT_DEFAULT_FIXED_SAMPLE_LOCATIONS,
-        DIRTY_BIT_UNKNOWN,
-        DIRTY_BIT_MAX = DIRTY_BIT_UNKNOWN
-    };
-
-    typedef angle::BitSet<DIRTY_BIT_MAX> DirtyBits;
-    bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
-
-    void syncState(const Context *context);
-
-    // OnAttachmentChangedReceiver implementation
-    void signal(size_t dirtyBit, InitState state) override;
-
-    bool formsRenderingFeedbackLoopWith(const State &state) const;
-    bool formsCopyingFeedbackLoopWith(GLuint copyTextureID,
-                                      GLint copyTextureLevel,
-                                      GLint copyTextureLayer) const;
-
-    Error ensureDrawAttachmentsInitialized(const Context *context);
-    Error ensureReadAttachmentInitialized(const Context *context, GLbitfield blitMask);
-    Box getDimensions() const;
-
-    bool hasTextureAttachment(const Texture *texture) const;
-
-  private:
-    bool detachResourceById(const Context *context, GLenum resourceType, GLuint resourceId);
-    bool detachMatchingAttachment(const Context *context,
-                                  FramebufferAttachment *attachment,
-                                  GLenum matchType,
-                                  GLuint matchId,
-                                  size_t dirtyBit);
-    GLenum checkStatusImpl(const Context *context);
-    void setAttachment(const Context *context,
-                       GLenum type,
-                       GLenum binding,
-                       const ImageIndex &textureIndex,
-                       FramebufferAttachmentObject *resource,
-                       GLsizei numViews,
-                       GLuint baseViewIndex,
-                       GLenum multiviewLayout,
-                       const GLint *viewportOffsets);
-    void commitWebGL1DepthStencilIfConsistent(const Context *context,
-                                              GLsizei numViews,
-                                              GLuint baseViewIndex,
-                                              GLenum multiviewLayout,
-                                              const GLint *viewportOffsets);
-    void setAttachmentImpl(const Context *context,
-                           GLenum type,
-                           GLenum binding,
-                           const ImageIndex &textureIndex,
-                           FramebufferAttachmentObject *resource,
-                           GLsizei numViews,
-                           GLuint baseViewIndex,
-                           GLenum multiviewLayout,
-                           const GLint *viewportOffsets);
-    void updateAttachment(const Context *context,
-                          FramebufferAttachment *attachment,
-                          size_t dirtyBit,
-                          OnAttachmentDirtyBinding *onDirtyBinding,
-                          GLenum type,
-                          GLenum binding,
-                          const ImageIndex &textureIndex,
-                          FramebufferAttachmentObject *resource,
-                          GLsizei numViews,
-                          GLuint baseViewIndex,
-                          GLenum multiviewLayout,
-                          const GLint *viewportOffsets);
-
-    void markDrawAttachmentsInitialized(bool color, bool depth, bool stencil);
-    void markBufferInitialized(GLenum bufferType, GLint bufferIndex);
-    Error ensureBufferInitialized(const Context *context, GLenum bufferType, GLint bufferIndex);
-
-    // Checks that we have a partially masked clear:
-    // * some color channels are masked out
-    // * some stencil values are masked out
-    // * scissor test partially overlaps the framebuffer
-    bool partialClearNeedsInit(const Context *context, bool color, bool depth, bool stencil);
-    bool partialBufferClearNeedsInit(const Context *context, GLenum bufferType);
-
-    FramebufferState mState;
-    rx::FramebufferImpl *mImpl;
-    GLuint mId;
-
-    Optional<GLenum> mCachedStatus;
-    std::vector<OnAttachmentDirtyBinding> mDirtyColorAttachmentBindings;
-    OnAttachmentDirtyBinding mDirtyDepthAttachmentBinding;
-    OnAttachmentDirtyBinding mDirtyStencilAttachmentBinding;
-
-    DirtyBits mDirtyBits;
-
-    // A cache of attached textures for quick validation of feedback loops.
-    mutable Optional<std::set<const FramebufferAttachmentObject *>> mAttachedTextures;
-};
-
-}  // namespace gl
-
-#endif  // LIBANGLE_FRAMEBUFFER_H_