diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-18 15:16:30 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-26 15:11:40 +0200 |
commit | 752497910b67b2a1a80560840ca44548d8893434 (patch) | |
tree | 541501c9abfd97c3d2fa450d2e6abb60582c4420 /src/3rdparty/angle/src/compiler/translator/ValidateOutputs.cpp | |
parent | 7db527dbdd911c79f31425d099d1fc9c63e42453 (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/ValidateOutputs.cpp')
-rw-r--r-- | src/3rdparty/angle/src/compiler/translator/ValidateOutputs.cpp | 174 |
1 files changed, 0 insertions, 174 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/ValidateOutputs.cpp b/src/3rdparty/angle/src/compiler/translator/ValidateOutputs.cpp deleted file mode 100644 index 26f0e81ba7..0000000000 --- a/src/3rdparty/angle/src/compiler/translator/ValidateOutputs.cpp +++ /dev/null @@ -1,174 +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. -// -// ValidateOutputs validates fragment shader outputs. It checks for conflicting locations, -// out-of-range locations, that locations are specified when using multiple outputs, and YUV output -// validity. - -#include "compiler/translator/ValidateOutputs.h" - -#include <set> - -#include "compiler/translator/InfoSink.h" -#include "compiler/translator/IntermTraverse.h" -#include "compiler/translator/ParseContext.h" - -namespace sh -{ - -namespace -{ -void error(const TIntermSymbol &symbol, const char *reason, TDiagnostics *diagnostics) -{ - diagnostics->error(symbol.getLine(), reason, symbol.getSymbol().c_str()); -} - -class ValidateOutputsTraverser : public TIntermTraverser -{ - public: - ValidateOutputsTraverser(const TExtensionBehavior &extBehavior, int maxDrawBuffers); - - void validate(TDiagnostics *diagnostics) const; - - void visitSymbol(TIntermSymbol *) override; - - private: - int mMaxDrawBuffers; - bool mAllowUnspecifiedOutputLocationResolution; - bool mUsesFragDepth; - - typedef std::vector<TIntermSymbol *> OutputVector; - OutputVector mOutputs; - OutputVector mUnspecifiedLocationOutputs; - OutputVector mYuvOutputs; - std::set<std::string> mVisitedSymbols; -}; - -ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &extBehavior, - int maxDrawBuffers) - : TIntermTraverser(true, false, false), - mMaxDrawBuffers(maxDrawBuffers), - mAllowUnspecifiedOutputLocationResolution( - IsExtensionEnabled(extBehavior, TExtension::EXT_blend_func_extended)), - mUsesFragDepth(false) -{ -} - -void ValidateOutputsTraverser::visitSymbol(TIntermSymbol *symbol) -{ - TString name = symbol->getSymbol(); - TQualifier qualifier = symbol->getQualifier(); - - if (mVisitedSymbols.count(name.c_str()) == 1) - return; - - mVisitedSymbols.insert(name.c_str()); - - if (qualifier == EvqFragmentOut) - { - if (symbol->getType().getLayoutQualifier().location != -1) - { - mOutputs.push_back(symbol); - } - else if (symbol->getType().getLayoutQualifier().yuv == true) - { - mYuvOutputs.push_back(symbol); - } - else - { - mUnspecifiedLocationOutputs.push_back(symbol); - } - } - else if (qualifier == EvqFragDepth || qualifier == EvqFragDepthEXT) - { - mUsesFragDepth = true; - } -} - -void ValidateOutputsTraverser::validate(TDiagnostics *diagnostics) const -{ - ASSERT(diagnostics); - OutputVector validOutputs(mMaxDrawBuffers); - - for (const auto &symbol : mOutputs) - { - const TType &type = symbol->getType(); - ASSERT(!type.isArrayOfArrays()); // Disallowed in GLSL ES 3.10 section 4.3.6. - const size_t elementCount = - static_cast<size_t>(type.isArray() ? type.getOutermostArraySize() : 1u); - const size_t location = static_cast<size_t>(type.getLayoutQualifier().location); - - ASSERT(type.getLayoutQualifier().location != -1); - - if (location + elementCount <= validOutputs.size()) - { - for (size_t elementIndex = 0; elementIndex < elementCount; elementIndex++) - { - const size_t offsetLocation = location + elementIndex; - if (validOutputs[offsetLocation]) - { - std::stringstream strstr; - strstr << "conflicting output locations with previously defined output '" - << validOutputs[offsetLocation]->getSymbol() << "'"; - error(*symbol, strstr.str().c_str(), diagnostics); - } - else - { - validOutputs[offsetLocation] = symbol; - } - } - } - else - { - if (elementCount > 0) - { - error(*symbol, - elementCount > 1 ? "output array locations would exceed MAX_DRAW_BUFFERS" - : "output location must be < MAX_DRAW_BUFFERS", - diagnostics); - } - } - } - - if (!mAllowUnspecifiedOutputLocationResolution && - ((!mOutputs.empty() && !mUnspecifiedLocationOutputs.empty()) || - mUnspecifiedLocationOutputs.size() > 1)) - { - for (const auto &symbol : mUnspecifiedLocationOutputs) - { - error(*symbol, - "must explicitly specify all locations when using multiple fragment outputs", - diagnostics); - } - } - - if (!mYuvOutputs.empty() && (mYuvOutputs.size() > 1 || mUsesFragDepth || !mOutputs.empty() || - !mUnspecifiedLocationOutputs.empty())) - { - for (const auto &symbol : mYuvOutputs) - { - error(*symbol, - "not allowed to specify yuv qualifier when using depth or multiple color " - "fragment outputs", - diagnostics); - } - } -} - -} // anonymous namespace - -bool ValidateOutputs(TIntermBlock *root, - const TExtensionBehavior &extBehavior, - int maxDrawBuffers, - TDiagnostics *diagnostics) -{ - ValidateOutputsTraverser validateOutputs(extBehavior, maxDrawBuffers); - root->traverse(&validateOutputs); - int numErrorsBefore = diagnostics->numErrors(); - validateOutputs.validate(diagnostics); - return (diagnostics->numErrors() == numErrorsBefore); -} - -} // namespace sh |