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/libANGLE/BinaryStream.h | |
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/libANGLE/BinaryStream.h')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/BinaryStream.h | 261 |
1 files changed, 0 insertions, 261 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/BinaryStream.h b/src/3rdparty/angle/src/libANGLE/BinaryStream.h deleted file mode 100644 index 3e4c0934cf..0000000000 --- a/src/3rdparty/angle/src/libANGLE/BinaryStream.h +++ /dev/null @@ -1,261 +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. -// - -// BinaryStream.h: Provides binary serialization of simple types. - -#ifndef LIBANGLE_BINARYSTREAM_H_ -#define LIBANGLE_BINARYSTREAM_H_ - -#include <cstddef> -#include <string> -#include <vector> -#include <stdint.h> - -#include "common/angleutils.h" -#include "common/mathutil.h" - -namespace gl -{ - -class BinaryInputStream : angle::NonCopyable -{ - public: - BinaryInputStream(const void *data, size_t length) - { - mError = false; - mOffset = 0; - mData = static_cast<const uint8_t*>(data); - mLength = length; - } - - // readInt will generate an error for bool types - template <class IntT> - IntT readInt() - { - int value = 0; - read(&value); - return static_cast<IntT>(value); - } - - template <class IntT> - void readInt(IntT *outValue) - { - *outValue = readInt<IntT>(); - } - - template <class IntT, class VectorElementT> - void readIntVector(std::vector<VectorElementT> *param) - { - unsigned int size = readInt<unsigned int>(); - for (unsigned int index = 0; index < size; ++index) - { - param->push_back(readInt<IntT>()); - } - } - - bool readBool() - { - int value = 0; - read(&value); - return (value > 0); - } - - void readBool(bool *outValue) - { - *outValue = readBool(); - } - - void readBytes(unsigned char outArray[], size_t count) - { - read<unsigned char>(outArray, count); - } - - std::string readString() - { - std::string outString; - readString(&outString); - return outString; - } - - void readString(std::string *v) - { - size_t length; - readInt(&length); - - if (mError) - { - return; - } - - angle::CheckedNumeric<size_t> checkedOffset(mOffset); - checkedOffset += length; - - if (!checkedOffset.IsValid() || mOffset + length > mLength) - { - mError = true; - return; - } - - v->assign(reinterpret_cast<const char *>(mData) + mOffset, length); - mOffset = checkedOffset.ValueOrDie(); - } - - void skip(size_t length) - { - angle::CheckedNumeric<size_t> checkedOffset(mOffset); - checkedOffset += length; - - if (!checkedOffset.IsValid() || mOffset + length > mLength) - { - mError = true; - return; - } - - mOffset = checkedOffset.ValueOrDie(); - } - - size_t offset() const - { - return mOffset; - } - - bool error() const - { - return mError; - } - - bool endOfStream() const - { - return mOffset == mLength; - } - - const uint8_t *data() - { - return mData; - } - - private: - bool mError; - size_t mOffset; - const uint8_t *mData; - size_t mLength; - - template <typename T> - void read(T *v, size_t num) - { - static_assert(std::is_fundamental<T>::value, "T must be a fundamental type."); - - angle::CheckedNumeric<size_t> checkedLength(num); - checkedLength *= sizeof(T); - if (!checkedLength.IsValid()) - { - mError = true; - return; - } - - angle::CheckedNumeric<size_t> checkedOffset(mOffset); - checkedOffset += checkedLength; - - if (!checkedOffset.IsValid() || checkedOffset.ValueOrDie() > mLength) - { - mError = true; - return; - } - - memcpy(v, mData + mOffset, checkedLength.ValueOrDie()); - mOffset = checkedOffset.ValueOrDie(); - } - - template <typename T> - void read(T *v) - { - read(v, 1); - } - -}; - -class BinaryOutputStream : angle::NonCopyable -{ - public: - BinaryOutputStream(); - ~BinaryOutputStream(); - - // writeInt also handles bool types - template <class IntT> - void writeInt(IntT param) - { - ASSERT(angle::IsValueInRangeForNumericType<int>(param)); - int intValue = static_cast<int>(param); - write(&intValue, 1); - } - - // Specialized writeInt for values that can also be exactly -1. - template <class UintT> - void writeIntOrNegOne(UintT param) - { - if (param == static_cast<UintT>(-1)) - { - writeInt(-1); - } - else - { - writeInt(param); - } - } - - template <class IntT> - void writeIntVector(std::vector<IntT> param) - { - writeInt(param.size()); - for (IntT element : param) - { - writeIntOrNegOne(element); - } - } - - void writeString(const std::string &v) - { - writeInt(v.length()); - write(v.c_str(), v.length()); - } - - void writeBytes(const unsigned char *bytes, size_t count) - { - write(bytes, count); - } - - size_t length() const - { - return mData.size(); - } - - const void* data() const - { - return mData.size() ? &mData[0] : nullptr; - } - - private: - std::vector<char> mData; - - template <typename T> - void write(const T *v, size_t num) - { - static_assert(std::is_fundamental<T>::value, "T must be a fundamental type."); - const char *asBytes = reinterpret_cast<const char*>(v); - mData.insert(mData.end(), asBytes, asBytes + num * sizeof(T)); - } - -}; - -inline BinaryOutputStream::BinaryOutputStream() -{ -} - -inline BinaryOutputStream::~BinaryOutputStream() = default; - -} // namespace gl - -#endif // LIBANGLE_BINARYSTREAM_H_ |