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

diff --git a/src/3rdparty/angle/src/compiler/translator/SimplifyLoopConditions.cpp b/src/3rdparty/angle/src/compiler/translator/SimplifyLoopConditions.cpp
deleted file mode 100644
index 9704046839..0000000000
--- a/src/3rdparty/angle/src/compiler/translator/SimplifyLoopConditions.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-//
-// Copyright (c) 2016 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.
-//
-// SimplifyLoopConditions is an AST traverser that converts loop conditions and loop expressions
-// to regular statements inside the loop. This way further transformations that generate statements
-// from loop conditions and loop expressions work correctly.
-//
-
-#include "compiler/translator/SimplifyLoopConditions.h"
-
-#include "compiler/translator/IntermNodePatternMatcher.h"
-#include "compiler/translator/IntermNode_util.h"
-#include "compiler/translator/IntermTraverse.h"
-
-namespace sh
-{
-
-namespace
-{
-
-class SimplifyLoopConditionsTraverser : public TLValueTrackingTraverser
-{
-  public:
-    SimplifyLoopConditionsTraverser(unsigned int conditionsToSimplifyMask,
-                                    TSymbolTable *symbolTable,
-                                    int shaderVersion);
-
-    void traverseLoop(TIntermLoop *node) override;
-
-    bool visitUnary(Visit visit, TIntermUnary *node) override;
-    bool visitBinary(Visit visit, TIntermBinary *node) override;
-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
-    bool visitTernary(Visit visit, TIntermTernary *node) override;
-    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
-
-    bool foundLoopToChange() const { return mFoundLoopToChange; }
-
-  protected:
-    // Marked to true once an operation that needs to be hoisted out of a loop expression has been
-    // found.
-    bool mFoundLoopToChange;
-    bool mInsideLoopInitConditionOrExpression;
-    IntermNodePatternMatcher mConditionsToSimplify;
-};
-
-SimplifyLoopConditionsTraverser::SimplifyLoopConditionsTraverser(
-    unsigned int conditionsToSimplifyMask,
-    TSymbolTable *symbolTable,
-    int shaderVersion)
-    : TLValueTrackingTraverser(true, false, false, symbolTable, shaderVersion),
-      mFoundLoopToChange(false),
-      mInsideLoopInitConditionOrExpression(false),
-      mConditionsToSimplify(conditionsToSimplifyMask)
-{
-}
-
-// If we're inside a loop initialization, condition, or expression, we check for expressions that
-// should be moved out of the loop condition or expression. If one is found, the loop is
-// transformed.
-// If we're not inside loop initialization, condition, or expression, we only need to traverse nodes
-// that may contain loops.
-
-bool SimplifyLoopConditionsTraverser::visitUnary(Visit visit, TIntermUnary *node)
-{
-    if (!mInsideLoopInitConditionOrExpression)
-        return false;
-
-    if (mFoundLoopToChange)
-        return false;  // Already decided to change this loop.
-
-    mFoundLoopToChange = mConditionsToSimplify.match(node);
-    return !mFoundLoopToChange;
-}
-
-bool SimplifyLoopConditionsTraverser::visitBinary(Visit visit, TIntermBinary *node)
-{
-    if (!mInsideLoopInitConditionOrExpression)
-        return false;
-
-    if (mFoundLoopToChange)
-        return false;  // Already decided to change this loop.
-
-    mFoundLoopToChange = mConditionsToSimplify.match(node, getParentNode(), isLValueRequiredHere());
-    return !mFoundLoopToChange;
-}
-
-bool SimplifyLoopConditionsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
-{
-    if (!mInsideLoopInitConditionOrExpression)
-        return false;
-
-    if (mFoundLoopToChange)
-        return false;  // Already decided to change this loop.
-
-    mFoundLoopToChange = mConditionsToSimplify.match(node, getParentNode());
-    return !mFoundLoopToChange;
-}
-
-bool SimplifyLoopConditionsTraverser::visitTernary(Visit visit, TIntermTernary *node)
-{
-    if (!mInsideLoopInitConditionOrExpression)
-        return false;
-
-    if (mFoundLoopToChange)
-        return false;  // Already decided to change this loop.
-
-    mFoundLoopToChange = mConditionsToSimplify.match(node);
-    return !mFoundLoopToChange;
-}
-
-bool SimplifyLoopConditionsTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
-{
-    if (!mInsideLoopInitConditionOrExpression)
-        return false;
-
-    if (mFoundLoopToChange)
-        return false;  // Already decided to change this loop.
-
-    mFoundLoopToChange = mConditionsToSimplify.match(node);
-    return !mFoundLoopToChange;
-}
-
-void SimplifyLoopConditionsTraverser::traverseLoop(TIntermLoop *node)
-{
-    // Mark that we're inside a loop condition or expression, and determine if the loop needs to be
-    // transformed.
-
-    ScopedNodeInTraversalPath addToPath(this, node);
-
-    mInsideLoopInitConditionOrExpression = true;
-    mFoundLoopToChange                   = false;
-
-    if (!mFoundLoopToChange && node->getInit())
-    {
-        node->getInit()->traverse(this);
-    }
-
-    if (!mFoundLoopToChange && node->getCondition())
-    {
-        node->getCondition()->traverse(this);
-    }
-
-    if (!mFoundLoopToChange && node->getExpression())
-    {
-        node->getExpression()->traverse(this);
-    }
-
-    mInsideLoopInitConditionOrExpression = false;
-
-    if (mFoundLoopToChange)
-    {
-        nextTemporaryId();
-
-        // Replace the loop condition with a boolean variable that's updated on each iteration.
-        TLoopType loopType = node->getType();
-        if (loopType == ELoopWhile)
-        {
-            // Transform:
-            //   while (expr) { body; }
-            // into
-            //   bool s0 = expr;
-            //   while (s0) { { body; } s0 = expr; }
-            TIntermSequence tempInitSeq;
-            tempInitSeq.push_back(createTempInitDeclaration(node->getCondition()->deepCopy()));
-            insertStatementsInParentBlock(tempInitSeq);
-
-            TIntermBlock *newBody = new TIntermBlock();
-            if (node->getBody())
-            {
-                newBody->getSequence()->push_back(node->getBody());
-            }
-            newBody->getSequence()->push_back(
-                createTempAssignment(node->getCondition()->deepCopy()));
-
-            // Can't use queueReplacement to replace old body, since it may have been nullptr.
-            // It's safe to do the replacements in place here - the new body will still be
-            // traversed, but that won't create any problems.
-            node->setBody(newBody);
-            node->setCondition(createTempSymbol(node->getCondition()->getType()));
-        }
-        else if (loopType == ELoopDoWhile)
-        {
-            // Transform:
-            //   do {
-            //     body;
-            //   } while (expr);
-            // into
-            //   bool s0 = true;
-            //   do {
-            //     { body; }
-            //     s0 = expr;
-            //   } while (s0);
-            TIntermSequence tempInitSeq;
-            tempInitSeq.push_back(createTempInitDeclaration(CreateBoolNode(true)));
-            insertStatementsInParentBlock(tempInitSeq);
-
-            TIntermBlock *newBody = new TIntermBlock();
-            if (node->getBody())
-            {
-                newBody->getSequence()->push_back(node->getBody());
-            }
-            newBody->getSequence()->push_back(
-                createTempAssignment(node->getCondition()->deepCopy()));
-
-            // Can't use queueReplacement to replace old body, since it may have been nullptr.
-            // It's safe to do the replacements in place here - the new body will still be
-            // traversed, but that won't create any problems.
-            node->setBody(newBody);
-            node->setCondition(createTempSymbol(node->getCondition()->getType()));
-        }
-        else if (loopType == ELoopFor)
-        {
-            // Move the loop condition inside the loop.
-            // Transform:
-            //   for (init; expr; exprB) { body; }
-            // into
-            //   {
-            //     init;
-            //     bool s0 = expr;
-            //     while (s0) {
-            //       { body; }
-            //       exprB;
-            //       s0 = expr;
-            //     }
-            //   }
-            TIntermBlock *loopScope            = new TIntermBlock();
-            TIntermSequence *loopScopeSequence = loopScope->getSequence();
-
-            // Insert "init;"
-            if (node->getInit())
-            {
-                loopScopeSequence->push_back(node->getInit());
-            }
-
-            // Insert "bool s0 = expr;" if applicable, "bool s0 = true;" otherwise
-            TIntermTyped *conditionInitializer = nullptr;
-            if (node->getCondition())
-            {
-                conditionInitializer = node->getCondition()->deepCopy();
-            }
-            else
-            {
-                conditionInitializer = CreateBoolNode(true);
-            }
-            loopScopeSequence->push_back(createTempInitDeclaration(conditionInitializer));
-
-            // Insert "{ body; }" in the while loop
-            TIntermBlock *whileLoopBody = new TIntermBlock();
-            if (node->getBody())
-            {
-                whileLoopBody->getSequence()->push_back(node->getBody());
-            }
-            // Insert "exprB;" in the while loop
-            if (node->getExpression())
-            {
-                whileLoopBody->getSequence()->push_back(node->getExpression());
-            }
-            // Insert "s0 = expr;" in the while loop
-            if (node->getCondition())
-            {
-                whileLoopBody->getSequence()->push_back(
-                    createTempAssignment(node->getCondition()->deepCopy()));
-            }
-
-            // Create "while(s0) { whileLoopBody }"
-            TIntermLoop *whileLoop = new TIntermLoop(
-                ELoopWhile, nullptr, createTempSymbol(conditionInitializer->getType()), nullptr,
-                whileLoopBody);
-            loopScope->getSequence()->push_back(whileLoop);
-            queueReplacement(loopScope, OriginalNode::IS_DROPPED);
-
-            // After this the old body node will be traversed and loops inside it may be
-            // transformed. This is fine, since the old body node will still be in the AST after the
-            // transformation that's queued here, and transforming loops inside it doesn't need to
-            // know the exact post-transform path to it.
-        }
-    }
-
-    mFoundLoopToChange = false;
-
-    // We traverse the body of the loop even if the loop is transformed.
-    if (node->getBody())
-        node->getBody()->traverse(this);
-}
-
-}  // namespace
-
-void SimplifyLoopConditions(TIntermNode *root,
-                            unsigned int conditionsToSimplifyMask,
-                            TSymbolTable *symbolTable,
-                            int shaderVersion)
-{
-    SimplifyLoopConditionsTraverser traverser(conditionsToSimplifyMask, symbolTable, shaderVersion);
-    root->traverse(&traverser);
-    traverser.updateTree();
-}
-
-}  // namespace sh