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, 175 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/VertexBuffer.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/VertexBuffer.h
deleted file mode 100644
index df8085d3cb..0000000000
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/VertexBuffer.h
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2002-2012 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.
-//
-
-// VertexBuffer.h: Defines the abstract VertexBuffer class and VertexBufferInterface
-// class with derivations, classes that perform graphics API agnostic vertex buffer operations.
-
-#ifndef LIBANGLE_RENDERER_D3D_VERTEXBUFFER_H_
-#define LIBANGLE_RENDERER_D3D_VERTEXBUFFER_H_
-
-#include "common/angleutils.h"
-#include "libANGLE/Error.h"
-
-#include <GLES2/gl2.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-namespace gl
-{
-struct VertexAttribute;
-class VertexBinding;
-struct VertexAttribCurrentValueData;
-}
-
-namespace rx
-{
-class BufferFactoryD3D;
-
-// Use a ref-counting scheme with self-deletion on release. We do this so that we can more
-// easily manage the static buffer cache, without deleting currently bound buffers.
-class VertexBuffer : angle::NonCopyable
-{
-  public:
-    VertexBuffer();
-
-    virtual gl::Error initialize(unsigned int size, bool dynamicUsage) = 0;
-
-    // Warning: you should ensure binding really matches attrib.bindingIndex before using this
-    // function.
-    virtual gl::Error storeVertexAttributes(const gl::VertexAttribute &attrib,
-                                            const gl::VertexBinding &binding,
-                                            GLenum currentValueType,
-                                            GLint start,
-                                            GLsizei count,
-                                            GLsizei instances,
-                                            unsigned int offset,
-                                            const uint8_t *sourceData) = 0;
-
-    virtual unsigned int getBufferSize() const = 0;
-    virtual gl::Error setBufferSize(unsigned int size) = 0;
-    virtual gl::Error discard() = 0;
-
-    unsigned int getSerial() const;
-
-    // This may be overridden (e.g. by VertexBuffer11) if necessary.
-    virtual void hintUnmapResource() { };
-
-    // Reference counting.
-    void addRef();
-    void release();
-
-  protected:
-    void updateSerial();
-    virtual ~VertexBuffer();
-
-  private:
-    unsigned int mSerial;
-    static unsigned int mNextSerial;
-    unsigned int mRefCount;
-};
-
-class VertexBufferInterface : angle::NonCopyable
-{
-  public:
-    VertexBufferInterface(BufferFactoryD3D *factory, bool dynamic);
-    virtual ~VertexBufferInterface();
-
-    unsigned int getBufferSize() const;
-    bool empty() const { return getBufferSize() == 0; }
-
-    unsigned int getSerial() const;
-
-    VertexBuffer *getVertexBuffer() const;
-
-  protected:
-    gl::Error discard();
-
-    gl::Error setBufferSize(unsigned int size);
-
-    gl::ErrorOrResult<unsigned int> getSpaceRequired(const gl::VertexAttribute &attrib,
-                                                     const gl::VertexBinding &binding,
-                                                     GLsizei count,
-                                                     GLsizei instances) const;
-    BufferFactoryD3D *const mFactory;
-    VertexBuffer *mVertexBuffer;
-    bool mDynamic;
-};
-
-class StreamingVertexBufferInterface : public VertexBufferInterface
-{
-  public:
-    StreamingVertexBufferInterface(BufferFactoryD3D *factory, std::size_t initialSize);
-    ~StreamingVertexBufferInterface() override;
-
-    gl::Error storeDynamicAttribute(const gl::VertexAttribute &attrib,
-                                    const gl::VertexBinding &binding,
-                                    GLenum currentValueType,
-                                    GLint start,
-                                    GLsizei count,
-                                    GLsizei instances,
-                                    unsigned int *outStreamOffset,
-                                    const uint8_t *sourceData);
-
-    gl::Error reserveVertexSpace(const gl::VertexAttribute &attribute,
-                                 const gl::VertexBinding &binding,
-                                 GLsizei count,
-                                 GLsizei instances);
-
-  private:
-    gl::Error reserveSpace(unsigned int size);
-
-    unsigned int mWritePosition;
-    unsigned int mReservedSpace;
-};
-
-class StaticVertexBufferInterface : public VertexBufferInterface
-{
-  public:
-    explicit StaticVertexBufferInterface(BufferFactoryD3D *factory);
-    ~StaticVertexBufferInterface() override;
-
-    // Warning: you should ensure binding really matches attrib.bindingIndex before using these
-    // functions.
-    gl::Error storeStaticAttribute(const gl::VertexAttribute &attrib,
-                                   const gl::VertexBinding &binding,
-                                   GLint start,
-                                   GLsizei count,
-                                   GLsizei instances,
-                                   const uint8_t *sourceData);
-
-    bool matchesAttribute(const gl::VertexAttribute &attribute,
-                          const gl::VertexBinding &binding) const;
-
-    void setAttribute(const gl::VertexAttribute &attribute, const gl::VertexBinding &binding);
-
-  private:
-    class AttributeSignature final : angle::NonCopyable
-    {
-      public:
-        AttributeSignature();
-
-        bool matchesAttribute(const gl::VertexAttribute &attrib,
-                              const gl::VertexBinding &binding) const;
-
-        void set(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding);
-
-      private:
-        GLenum type;
-        GLuint size;
-        GLuint stride;
-        bool normalized;
-        bool pureInteger;
-        size_t offset;
-    };
-
-    AttributeSignature mSignature;
-};
-
-}  // namespace rx
-
-#endif // LIBANGLE_RENDERER_D3D_VERTEXBUFFER_H_