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

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
deleted file mode 100644
index 611bd0f18b..0000000000
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Copyright (c) 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.
-//
-
-// VertexBuffer11.cpp: Defines the D3D11 VertexBuffer implementation.
-
-#include "libANGLE/renderer/d3d/d3d11/VertexBuffer11.h"
-
-#include "libANGLE/Buffer.h"
-#include "libANGLE/VertexAttribute.h"
-#include "libANGLE/formatutils.h"
-#include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
-#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
-#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
-#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
-
-namespace rx
-{
-
-VertexBuffer11::VertexBuffer11(Renderer11 *const renderer)
-    : mRenderer(renderer),
-      mBuffer(),
-      mBufferSize(0),
-      mDynamicUsage(false),
-      mMappedResourceData(nullptr)
-{
-}
-
-VertexBuffer11::~VertexBuffer11()
-{
-    ASSERT(mMappedResourceData == nullptr);
-}
-
-gl::Error VertexBuffer11::initialize(unsigned int size, bool dynamicUsage)
-{
-    mBuffer.reset();
-    updateSerial();
-
-    if (size > 0)
-    {
-        D3D11_BUFFER_DESC bufferDesc;
-        bufferDesc.ByteWidth           = size;
-        bufferDesc.Usage               = D3D11_USAGE_DYNAMIC;
-        bufferDesc.BindFlags           = D3D11_BIND_VERTEX_BUFFER;
-        bufferDesc.CPUAccessFlags      = D3D11_CPU_ACCESS_WRITE;
-        bufferDesc.MiscFlags           = 0;
-        bufferDesc.StructureByteStride = 0;
-
-        ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &mBuffer));
-
-        if (dynamicUsage)
-        {
-            mBuffer.setDebugName("VertexBuffer11 (dynamic)");
-        }
-        else
-        {
-            mBuffer.setDebugName("VertexBuffer11 (static)");
-        }
-    }
-
-    mBufferSize   = size;
-    mDynamicUsage = dynamicUsage;
-
-    return gl::NoError();
-}
-
-gl::Error VertexBuffer11::mapResource()
-{
-    if (mMappedResourceData == nullptr)
-    {
-        ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
-
-        D3D11_MAPPED_SUBRESOURCE mappedResource;
-
-        HRESULT result =
-            dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mappedResource);
-        if (FAILED(result))
-        {
-            return gl::OutOfMemory()
-                   << "Failed to map internal vertex buffer, " << gl::FmtHR(result);
-        }
-
-        mMappedResourceData = reinterpret_cast<uint8_t *>(mappedResource.pData);
-    }
-
-    return gl::NoError();
-}
-
-void VertexBuffer11::hintUnmapResource()
-{
-    if (mMappedResourceData != nullptr)
-    {
-        ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
-        dxContext->Unmap(mBuffer.get(), 0);
-
-        mMappedResourceData = nullptr;
-    }
-}
-
-gl::Error VertexBuffer11::storeVertexAttributes(const gl::VertexAttribute &attrib,
-                                                const gl::VertexBinding &binding,
-                                                GLenum currentValueType,
-                                                GLint start,
-                                                GLsizei count,
-                                                GLsizei instances,
-                                                unsigned int offset,
-                                                const uint8_t *sourceData)
-{
-    if (!mBuffer.valid())
-    {
-        return gl::OutOfMemory() << "Internal vertex buffer is not initialized.";
-    }
-
-    int inputStride = static_cast<int>(ComputeVertexAttributeStride(attrib, binding));
-
-    // This will map the resource if it isn't already mapped.
-    ANGLE_TRY(mapResource());
-
-    uint8_t *output = mMappedResourceData + offset;
-
-    const uint8_t *input = sourceData;
-
-    if (instances == 0 || binding.getDivisor() == 0)
-    {
-        input += inputStride * start;
-    }
-
-    gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, currentValueType);
-    const D3D_FEATURE_LEVEL featureLevel  = mRenderer->getRenderer11DeviceCaps().featureLevel;
-    const d3d11::VertexFormat &vertexFormatInfo =
-        d3d11::GetVertexFormatInfo(vertexFormatType, featureLevel);
-    ASSERT(vertexFormatInfo.copyFunction != nullptr);
-    vertexFormatInfo.copyFunction(input, inputStride, count, output);
-
-    return gl::NoError();
-}
-
-unsigned int VertexBuffer11::getBufferSize() const
-{
-    return mBufferSize;
-}
-
-gl::Error VertexBuffer11::setBufferSize(unsigned int size)
-{
-    if (size > mBufferSize)
-    {
-        return initialize(size, mDynamicUsage);
-    }
-    else
-    {
-        return gl::NoError();
-    }
-}
-
-gl::Error VertexBuffer11::discard()
-{
-    if (!mBuffer.valid())
-    {
-        return gl::OutOfMemory() << "Internal vertex buffer is not initialized.";
-    }
-
-    ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
-
-    D3D11_MAPPED_SUBRESOURCE mappedResource;
-    HRESULT result = dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-    if (FAILED(result))
-    {
-        return gl::OutOfMemory() << "Failed to map internal buffer for discarding, "
-                                 << gl::FmtHR(result);
-    }
-
-    dxContext->Unmap(mBuffer.get(), 0);
-
-    return gl::NoError();
-}
-
-const d3d11::Buffer &VertexBuffer11::getBuffer() const
-{
-    return mBuffer;
-}
-
-}  // namespace rx