summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/compiler/translator/InitializeVariables.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-05-18 15:16:30 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-05-26 15:11:40 +0200
commit752497910b67b2a1a80560840ca44548d8893434 (patch)
tree541501c9abfd97c3d2fa450d2e6abb60582c4420 /src/3rdparty/angle/src/compiler/translator/InitializeVariables.cpp
parent7db527dbdd911c79f31425d099d1fc9c63e42453 (diff)
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>
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/InitializeVariables.cpp')
-rw-r--r--src/3rdparty/angle/src/compiler/translator/InitializeVariables.cpp290
1 files changed, 0 insertions, 290 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/InitializeVariables.cpp b/src/3rdparty/angle/src/compiler/translator/InitializeVariables.cpp
deleted file mode 100644
index aa1a042fac..0000000000
--- a/src/3rdparty/angle/src/compiler/translator/InitializeVariables.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-//
-// Copyright (c) 2002-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.
-//
-
-#include "compiler/translator/InitializeVariables.h"
-
-#include "angle_gl.h"
-#include "common/debug.h"
-#include "compiler/translator/FindMain.h"
-#include "compiler/translator/IntermNode_util.h"
-#include "compiler/translator/IntermTraverse.h"
-#include "compiler/translator/SymbolTable.h"
-#include "compiler/translator/util.h"
-
-namespace sh
-{
-
-namespace
-{
-
-void AddArrayZeroInitSequence(const TIntermTyped *initializedNode,
- bool canUseLoopsToInitialize,
- TIntermSequence *initSequenceOut,
- TSymbolTable *symbolTable);
-
-void AddStructZeroInitSequence(const TIntermTyped *initializedNode,
- bool canUseLoopsToInitialize,
- TIntermSequence *initSequenceOut,
- TSymbolTable *symbolTable);
-
-TIntermBinary *CreateZeroInitAssignment(const TIntermTyped *initializedNode)
-{
- TIntermTyped *zero = CreateZeroNode(initializedNode->getType());
- return new TIntermBinary(EOpAssign, initializedNode->deepCopy(), zero);
-}
-
-void AddZeroInitSequence(const TIntermTyped *initializedNode,
- bool canUseLoopsToInitialize,
- TIntermSequence *initSequenceOut,
- TSymbolTable *symbolTable)
-{
- if (initializedNode->isArray())
- {
- AddArrayZeroInitSequence(initializedNode, canUseLoopsToInitialize, initSequenceOut,
- symbolTable);
- }
- else if (initializedNode->getType().isStructureContainingArrays() ||
- initializedNode->getType().isNamelessStruct())
- {
- AddStructZeroInitSequence(initializedNode, canUseLoopsToInitialize, initSequenceOut,
- symbolTable);
- }
- else
- {
- initSequenceOut->push_back(CreateZeroInitAssignment(initializedNode));
- }
-}
-
-void AddStructZeroInitSequence(const TIntermTyped *initializedNode,
- bool canUseLoopsToInitialize,
- TIntermSequence *initSequenceOut,
- TSymbolTable *symbolTable)
-{
- ASSERT(initializedNode->getBasicType() == EbtStruct);
- const TStructure *structType = initializedNode->getType().getStruct();
- for (int i = 0; i < static_cast<int>(structType->fields().size()); ++i)
- {
- TIntermBinary *element = new TIntermBinary(EOpIndexDirectStruct,
- initializedNode->deepCopy(), CreateIndexNode(i));
- // Structs can't be defined inside structs, so the type of a struct field can't be a
- // nameless struct.
- ASSERT(!element->getType().isNamelessStruct());
- AddZeroInitSequence(element, canUseLoopsToInitialize, initSequenceOut, symbolTable);
- }
-}
-
-void AddArrayZeroInitStatementList(const TIntermTyped *initializedNode,
- bool canUseLoopsToInitialize,
- TIntermSequence *initSequenceOut,
- TSymbolTable *symbolTable)
-{
- for (unsigned int i = 0; i < initializedNode->getOutermostArraySize(); ++i)
- {
- TIntermBinary *element =
- new TIntermBinary(EOpIndexDirect, initializedNode->deepCopy(), CreateIndexNode(i));
- AddZeroInitSequence(element, canUseLoopsToInitialize, initSequenceOut, symbolTable);
- }
-}
-
-void AddArrayZeroInitForLoop(const TIntermTyped *initializedNode,
- TIntermSequence *initSequenceOut,
- TSymbolTable *symbolTable)
-{
- ASSERT(initializedNode->isArray());
- TSymbolUniqueId indexSymbol(symbolTable);
-
- TIntermSymbol *indexSymbolNode = CreateTempSymbolNode(indexSymbol, TType(EbtInt), EvqTemporary);
- TIntermDeclaration *indexInit =
- CreateTempInitDeclarationNode(indexSymbol, CreateZeroNode(TType(EbtInt)), EvqTemporary);
- TIntermConstantUnion *arraySizeNode = CreateIndexNode(initializedNode->getOutermostArraySize());
- TIntermBinary *indexSmallerThanSize =
- new TIntermBinary(EOpLessThan, indexSymbolNode->deepCopy(), arraySizeNode);
- TIntermUnary *indexIncrement = new TIntermUnary(EOpPreIncrement, indexSymbolNode->deepCopy());
-
- TIntermBlock *forLoopBody = new TIntermBlock();
- TIntermSequence *forLoopBodySeq = forLoopBody->getSequence();
-
- TIntermBinary *element = new TIntermBinary(EOpIndexIndirect, initializedNode->deepCopy(),
- indexSymbolNode->deepCopy());
- AddZeroInitSequence(element, true, forLoopBodySeq, symbolTable);
-
- TIntermLoop *forLoop =
- new TIntermLoop(ELoopFor, indexInit, indexSmallerThanSize, indexIncrement, forLoopBody);
- initSequenceOut->push_back(forLoop);
-}
-
-void AddArrayZeroInitSequence(const TIntermTyped *initializedNode,
- bool canUseLoopsToInitialize,
- TIntermSequence *initSequenceOut,
- TSymbolTable *symbolTable)
-{
- // The array elements are assigned one by one to keep the AST compatible with ESSL 1.00 which
- // doesn't have array assignment. We'll do this either with a for loop or just a list of
- // statements assigning to each array index. Note that it is important to have the array init in
- // the right order to workaround http://crbug.com/709317
- bool isSmallArray = initializedNode->getOutermostArraySize() <= 1u ||
- (initializedNode->getBasicType() != EbtStruct &&
- !initializedNode->getType().isArrayOfArrays() &&
- initializedNode->getOutermostArraySize() <= 3u);
- if (initializedNode->getQualifier() == EvqFragData ||
- initializedNode->getQualifier() == EvqFragmentOut || isSmallArray ||
- !canUseLoopsToInitialize)
- {
- // Fragment outputs should not be indexed by non-constant indices.
- // Also it doesn't make sense to use loops to initialize very small arrays.
- AddArrayZeroInitStatementList(initializedNode, canUseLoopsToInitialize, initSequenceOut,
- symbolTable);
- }
- else
- {
- AddArrayZeroInitForLoop(initializedNode, initSequenceOut, symbolTable);
- }
-}
-
-void InsertInitCode(TIntermSequence *mainBody,
- const InitVariableList &variables,
- TSymbolTable *symbolTable,
- int shaderVersion,
- const TExtensionBehavior &extensionBehavior,
- bool canUseLoopsToInitialize)
-{
- for (const auto &var : variables)
- {
- TString name = TString(var.name.c_str());
- size_t pos = name.find_last_of('[');
- if (pos != TString::npos)
- {
- name = name.substr(0, pos);
- }
-
- TIntermTyped *initializedSymbol = nullptr;
- if (var.isBuiltIn())
- {
- initializedSymbol = ReferenceBuiltInVariable(name, *symbolTable, shaderVersion);
- if (initializedSymbol->getQualifier() == EvqFragData &&
- !IsExtensionEnabled(extensionBehavior, TExtension::EXT_draw_buffers))
- {
- // If GL_EXT_draw_buffers is disabled, only the 0th index of gl_FragData can be
- // written to.
- // TODO(oetuaho): This is a bit hacky and would be better to remove, if we came up
- // with a good way to do it. Right now "gl_FragData" in symbol table is initialized
- // to have the array size of MaxDrawBuffers, and the initialization happens before
- // the shader sets the extensions it is using.
- initializedSymbol =
- new TIntermBinary(EOpIndexDirect, initializedSymbol, CreateIndexNode(0));
- }
- }
- else
- {
- initializedSymbol = ReferenceGlobalVariable(name, *symbolTable);
- }
- ASSERT(initializedSymbol != nullptr);
-
- TIntermSequence *initCode =
- CreateInitCode(initializedSymbol, canUseLoopsToInitialize, symbolTable);
- mainBody->insert(mainBody->begin(), initCode->begin(), initCode->end());
- }
-}
-
-class InitializeLocalsTraverser : public TIntermTraverser
-{
- public:
- InitializeLocalsTraverser(int shaderVersion,
- TSymbolTable *symbolTable,
- bool canUseLoopsToInitialize)
- : TIntermTraverser(true, false, false, symbolTable),
- mShaderVersion(shaderVersion),
- mCanUseLoopsToInitialize(canUseLoopsToInitialize)
- {
- }
-
- protected:
- bool visitDeclaration(Visit visit, TIntermDeclaration *node) override
- {
- for (TIntermNode *declarator : *node->getSequence())
- {
- if (!mInGlobalScope && !declarator->getAsBinaryNode())
- {
- TIntermSymbol *symbol = declarator->getAsSymbolNode();
- ASSERT(symbol);
- if (symbol->getSymbol() == "")
- {
- continue;
- }
-
- // Arrays may need to be initialized one element at a time, since ESSL 1.00 does not
- // support array constructors or assigning arrays.
- bool arrayConstructorUnavailable =
- (symbol->isArray() || symbol->getType().isStructureContainingArrays()) &&
- mShaderVersion == 100;
- // Nameless struct constructors can't be referred to, so they also need to be
- // initialized one element at a time.
- // TODO(oetuaho): Check if it makes sense to initialize using a loop, even if we
- // could use an initializer. It could at least reduce code size for very large
- // arrays, but could hurt runtime performance.
- if (arrayConstructorUnavailable || symbol->getType().isNamelessStruct())
- {
- // SimplifyLoopConditions should have been run so the parent node of this node
- // should not be a loop.
- ASSERT(getParentNode()->getAsLoopNode() == nullptr);
- // SeparateDeclarations should have already been run, so we don't need to worry
- // about further declarators in this declaration depending on the effects of
- // this declarator.
- ASSERT(node->getSequence()->size() == 1);
- insertStatementsInParentBlock(
- TIntermSequence(),
- *CreateInitCode(symbol, mCanUseLoopsToInitialize, mSymbolTable));
- }
- else
- {
- TIntermBinary *init =
- new TIntermBinary(EOpInitialize, symbol, CreateZeroNode(symbol->getType()));
- queueReplacementWithParent(node, symbol, init, OriginalNode::BECOMES_CHILD);
- }
- }
- }
- return false;
- }
-
- private:
- int mShaderVersion;
- bool mCanUseLoopsToInitialize;
-};
-
-} // namespace anonymous
-
-TIntermSequence *CreateInitCode(const TIntermTyped *initializedSymbol,
- bool canUseLoopsToInitialize,
- TSymbolTable *symbolTable)
-{
- TIntermSequence *initCode = new TIntermSequence();
- AddZeroInitSequence(initializedSymbol, canUseLoopsToInitialize, initCode, symbolTable);
- return initCode;
-}
-
-void InitializeUninitializedLocals(TIntermBlock *root,
- int shaderVersion,
- bool canUseLoopsToInitialize,
- TSymbolTable *symbolTable)
-{
- InitializeLocalsTraverser traverser(shaderVersion, symbolTable, canUseLoopsToInitialize);
- root->traverse(&traverser);
- traverser.updateTree();
-}
-
-void InitializeVariables(TIntermBlock *root,
- const InitVariableList &vars,
- TSymbolTable *symbolTable,
- int shaderVersion,
- const TExtensionBehavior &extensionBehavior,
- bool canUseLoopsToInitialize)
-{
- TIntermBlock *body = FindMainBody(root);
- InsertInitCode(body->getSequence(), vars, symbolTable, shaderVersion, extensionBehavior,
- canUseLoopsToInitialize);
-}
-
-} // namespace sh