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

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
deleted file mode 100644
index db49cac9f5..0000000000
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 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.
-//
-
-// RenderTarget11.h: Defines a DX11-specific wrapper for ID3D11View pointers
-// retained by Renderbuffers.
-
-#ifndef LIBANGLE_RENDERER_D3D_D3D11_RENDERTARGET11_H_
-#define LIBANGLE_RENDERER_D3D_D3D11_RENDERTARGET11_H_
-
-#include "libANGLE/renderer/d3d/RenderTargetD3D.h"
-#include "libANGLE/renderer/d3d/d3d11/ResourceManager11.h"
-#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
-#include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
-
-namespace rx
-{
-class SwapChain11;
-class Renderer11;
-
-class RenderTarget11 : public RenderTargetD3D
-{
-  public:
-    RenderTarget11(const d3d11::Format &formatSet);
-    ~RenderTarget11() override;
-
-    virtual const TextureHelper11 &getTexture() const                  = 0;
-    virtual const d3d11::RenderTargetView &getRenderTargetView() const = 0;
-    virtual const d3d11::DepthStencilView &getDepthStencilView() const = 0;
-    virtual const d3d11::SharedSRV &getShaderResourceView() const      = 0;
-    virtual const d3d11::SharedSRV &getBlitShaderResourceView() const  = 0;
-
-    virtual unsigned int getSubresourceIndex() const = 0;
-
-    void signalDirty(const gl::Context *context) override;
-    OnRenderTargetDirtyChannel *getBroadcastChannel() { return &mBroadcastChannel; }
-
-    const d3d11::Format &getFormatSet() const { return mFormatSet; }
-
-  protected:
-    OnRenderTargetDirtyChannel mBroadcastChannel;
-    const d3d11::Format &mFormatSet;
-};
-
-class TextureRenderTarget11 : public RenderTarget11
-{
-  public:
-    // TextureRenderTarget11 takes ownership of any D3D11 resources it is given and will AddRef them
-    TextureRenderTarget11(d3d11::RenderTargetView &&rtv,
-                          const TextureHelper11 &resource,
-                          const d3d11::SharedSRV &srv,
-                          const d3d11::SharedSRV &blitSRV,
-                          GLenum internalFormat,
-                          const d3d11::Format &formatSet,
-                          GLsizei width,
-                          GLsizei height,
-                          GLsizei depth,
-                          GLsizei samples);
-    TextureRenderTarget11(d3d11::DepthStencilView &&dsv,
-                          const TextureHelper11 &resource,
-                          const d3d11::SharedSRV &srv,
-                          GLenum internalFormat,
-                          const d3d11::Format &formatSet,
-                          GLsizei width,
-                          GLsizei height,
-                          GLsizei depth,
-                          GLsizei samples);
-    ~TextureRenderTarget11() override;
-
-    GLsizei getWidth() const override;
-    GLsizei getHeight() const override;
-    GLsizei getDepth() const override;
-    GLenum getInternalFormat() const override;
-    GLsizei getSamples() const override;
-
-    const TextureHelper11 &getTexture() const override;
-    const d3d11::RenderTargetView &getRenderTargetView() const override;
-    const d3d11::DepthStencilView &getDepthStencilView() const override;
-    const d3d11::SharedSRV &getShaderResourceView() const override;
-    const d3d11::SharedSRV &getBlitShaderResourceView() const override;
-
-    unsigned int getSubresourceIndex() const override;
-
-  private:
-    GLsizei mWidth;
-    GLsizei mHeight;
-    GLsizei mDepth;
-    GLenum mInternalFormat;
-    GLsizei mSamples;
-
-    unsigned int mSubresourceIndex;
-    TextureHelper11 mTexture;
-    d3d11::RenderTargetView mRenderTarget;
-    d3d11::DepthStencilView mDepthStencil;
-    d3d11::SharedSRV mShaderResource;
-
-    // Shader resource view to use with internal blit shaders. Not set for depth/stencil render
-    // targets.
-    d3d11::SharedSRV mBlitShaderResource;
-};
-
-class SurfaceRenderTarget11 : public RenderTarget11
-{
-  public:
-    SurfaceRenderTarget11(SwapChain11 *swapChain, Renderer11 *renderer, bool depth);
-    ~SurfaceRenderTarget11() override;
-
-    GLsizei getWidth() const override;
-    GLsizei getHeight() const override;
-    GLsizei getDepth() const override;
-    GLenum getInternalFormat() const override;
-    GLsizei getSamples() const override;
-
-    const TextureHelper11 &getTexture() const override;
-    const d3d11::RenderTargetView &getRenderTargetView() const override;
-    const d3d11::DepthStencilView &getDepthStencilView() const override;
-    const d3d11::SharedSRV &getShaderResourceView() const override;
-    const d3d11::SharedSRV &getBlitShaderResourceView() const override;
-
-    unsigned int getSubresourceIndex() const override;
-
-  private:
-    SwapChain11 *mSwapChain;
-    bool mDepth;
-};
-
-}  // namespace rx
-
-#endif // LIBANGLE_RENDERER_D3D_D3D11_RENDERTARGET11_H_