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

diff --git a/src/3rdparty/angle/src/compiler/translator/blocklayout.h b/src/3rdparty/angle/src/compiler/translator/blocklayout.h
deleted file mode 100644
index 2b7acf4e60..0000000000
--- a/src/3rdparty/angle/src/compiler/translator/blocklayout.h
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013-2014 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.
-//
-// blocklayout.h:
-//   Methods and classes related to uniform layout and packing in GLSL and HLSL.
-//
-
-#ifndef COMMON_BLOCKLAYOUT_H_
-#define COMMON_BLOCKLAYOUT_H_
-
-#include <cstddef>
-#include <map>
-#include <vector>
-
-#include "angle_gl.h"
-#include <GLSLANG/ShaderLang.h>
-
-namespace sh
-{
-struct ShaderVariable;
-struct InterfaceBlockField;
-struct Uniform;
-struct Varying;
-struct InterfaceBlock;
-
-struct BlockMemberInfo
-{
-    BlockMemberInfo()
-        : offset(-1),
-          arrayStride(-1),
-          matrixStride(-1),
-          isRowMajorMatrix(false),
-          topLevelArrayStride(-1)
-    {
-    }
-
-    BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
-        : offset(offset),
-          arrayStride(arrayStride),
-          matrixStride(matrixStride),
-          isRowMajorMatrix(isRowMajorMatrix),
-          topLevelArrayStride(-1)
-    {
-    }
-
-    BlockMemberInfo(int offset,
-                    int arrayStride,
-                    int matrixStride,
-                    bool isRowMajorMatrix,
-                    int topLevelArrayStride)
-        : offset(offset),
-          arrayStride(arrayStride),
-          matrixStride(matrixStride),
-          isRowMajorMatrix(isRowMajorMatrix),
-          topLevelArrayStride(topLevelArrayStride)
-    {
-    }
-
-    static BlockMemberInfo getDefaultBlockInfo() { return BlockMemberInfo(-1, -1, -1, false, -1); }
-
-    int offset;
-    int arrayStride;
-    int matrixStride;
-    bool isRowMajorMatrix;
-    int topLevelArrayStride;  // Only used for shader storage block members.
-};
-
-class BlockLayoutEncoder
-{
-  public:
-    BlockLayoutEncoder();
-    virtual ~BlockLayoutEncoder() {}
-
-    BlockMemberInfo encodeType(GLenum type,
-                               const std::vector<unsigned int> &arraySizes,
-                               bool isRowMajorMatrix);
-
-    size_t getBlockSize() const { return mCurrentOffset * BytesPerComponent; }
-
-    virtual void enterAggregateType() = 0;
-    virtual void exitAggregateType()  = 0;
-
-    static const size_t BytesPerComponent           = 4u;
-    static const unsigned int ComponentsPerRegister = 4u;
-
-    static size_t getBlockRegister(const BlockMemberInfo &info);
-    static size_t getBlockRegisterElement(const BlockMemberInfo &info);
-
-  protected:
-    size_t mCurrentOffset;
-
-    void nextRegister();
-
-    virtual void getBlockLayoutInfo(GLenum type,
-                                    const std::vector<unsigned int> &arraySizes,
-                                    bool isRowMajorMatrix,
-                                    int *arrayStrideOut,
-                                    int *matrixStrideOut) = 0;
-    virtual void advanceOffset(GLenum type,
-                               const std::vector<unsigned int> &arraySizes,
-                               bool isRowMajorMatrix,
-                               int arrayStride,
-                               int matrixStride)          = 0;
-};
-
-// Block layout according to the std140 block layout
-// See "Standard Uniform Block Layout" in Section 2.11.6 of the OpenGL ES 3.0 specification
-
-class Std140BlockEncoder : public BlockLayoutEncoder
-{
-  public:
-    Std140BlockEncoder();
-
-    void enterAggregateType() override;
-    void exitAggregateType() override;
-
-  protected:
-    void getBlockLayoutInfo(GLenum type,
-                            const std::vector<unsigned int> &arraySizes,
-                            bool isRowMajorMatrix,
-                            int *arrayStrideOut,
-                            int *matrixStrideOut) override;
-    void advanceOffset(GLenum type,
-                       const std::vector<unsigned int> &arraySizes,
-                       bool isRowMajorMatrix,
-                       int arrayStride,
-                       int matrixStride) override;
-};
-
-using BlockLayoutMap = std::map<std::string, BlockMemberInfo>;
-
-// Only valid to call with ShaderVariable, InterfaceBlockField and Uniform.
-template <typename VarT>
-void GetUniformBlockInfo(const std::vector<VarT> &fields,
-                         const std::string &prefix,
-                         sh::BlockLayoutEncoder *encoder,
-                         bool inRowMajorLayout,
-                         BlockLayoutMap *blockLayoutMap);
-
-}  // namespace sh
-
-#endif  // COMMON_BLOCKLAYOUT_H_