summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/common/utilities.h
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/common/utilities.h
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/common/utilities.h')
-rw-r--r--src/3rdparty/angle/src/common/utilities.h173
1 files changed, 0 insertions, 173 deletions
diff --git a/src/3rdparty/angle/src/common/utilities.h b/src/3rdparty/angle/src/common/utilities.h
deleted file mode 100644
index f2f9c63d0e..0000000000
--- a/src/3rdparty/angle/src/common/utilities.h
+++ /dev/null
@@ -1,173 +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.
-//
-
-// utilities.h: Conversion functions and other utility routines.
-
-#ifndef COMMON_UTILITIES_H_
-#define COMMON_UTILITIES_H_
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-#include <math.h>
-#include <string>
-#include <vector>
-#include "angle_gl.h"
-
-#include "common/mathutil.h"
-
-namespace gl
-{
-
-int VariableComponentCount(GLenum type);
-GLenum VariableComponentType(GLenum type);
-size_t VariableComponentSize(GLenum type);
-size_t VariableInternalSize(GLenum type);
-size_t VariableExternalSize(GLenum type);
-int VariableRowCount(GLenum type);
-int VariableColumnCount(GLenum type);
-bool IsSamplerType(GLenum type);
-bool IsImageType(GLenum type);
-bool IsAtomicCounterType(GLenum type);
-bool IsOpaqueType(GLenum type);
-GLenum SamplerTypeToTextureType(GLenum samplerType);
-bool IsMatrixType(GLenum type);
-GLenum TransposeMatrixType(GLenum type);
-int VariableRegisterCount(GLenum type);
-int MatrixRegisterCount(GLenum type, bool isRowMajorMatrix);
-int MatrixComponentCount(GLenum type, bool isRowMajorMatrix);
-int VariableSortOrder(GLenum type);
-GLenum VariableBoolVectorType(GLenum type);
-
-int AllocateFirstFreeBits(unsigned int *bits, unsigned int allocationSize, unsigned int bitsSize);
-
-static const GLenum FirstCubeMapTextureTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X;
-static const GLenum LastCubeMapTextureTarget = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
-bool IsCubeMapTextureTarget(GLenum target);
-size_t CubeMapTextureTargetToLayerIndex(GLenum target);
-GLenum LayerIndexToCubeMapTextureTarget(size_t index);
-
-// Parse the base resource name and array indices. Returns the base name of the resource.
-// If the provided name doesn't index an array, the outSubscripts vector will be empty.
-// If the provided name indexes an array, the outSubscripts vector will contain indices with
-// outermost array indices in the back. If an array index is invalid, GL_INVALID_INDEX is added to
-// outSubscripts.
-std::string ParseResourceName(const std::string &name, std::vector<unsigned int> *outSubscripts);
-
-// Find the range of index values in the provided indices pointer. Primitive restart indices are
-// only counted in the range if primitive restart is disabled.
-IndexRange ComputeIndexRange(GLenum indexType,
- const GLvoid *indices,
- size_t count,
- bool primitiveRestartEnabled);
-
-// Get the primitive restart index value for the given index type.
-GLuint GetPrimitiveRestartIndex(GLenum indexType);
-
-bool IsTriangleMode(GLenum drawMode);
-bool IsIntegerFormat(GLenum unsizedFormat);
-
-// Returns the product of the sizes in the vector, or 1 if the vector is empty. Doesn't currently
-// perform overflow checks.
-unsigned int ArraySizeProduct(const std::vector<unsigned int> &arraySizes);
-
-// Return the array index at the end of name, and write the length of name before the final array
-// index into nameLengthWithoutArrayIndexOut. In case name doesn't include an array index, return
-// GL_INVALID_INDEX and write the length of the original string.
-unsigned int ParseArrayIndex(const std::string &name, size_t *nameLengthWithoutArrayIndexOut);
-
-struct UniformTypeInfo final : angle::NonCopyable
-{
- constexpr UniformTypeInfo(GLenum type,
- GLenum componentType,
- GLenum samplerTextureType,
- GLenum transposedMatrixType,
- GLenum boolVectorType,
- int rowCount,
- int columnCount,
- int componentCount,
- size_t componentSize,
- size_t internalSize,
- size_t externalSize,
- bool isSampler,
- bool isMatrixType,
- bool isImageType)
- : type(type),
- componentType(componentType),
- samplerTextureType(samplerTextureType),
- transposedMatrixType(transposedMatrixType),
- boolVectorType(boolVectorType),
- rowCount(rowCount),
- columnCount(columnCount),
- componentCount(componentCount),
- componentSize(componentSize),
- internalSize(internalSize),
- externalSize(externalSize),
- isSampler(isSampler),
- isMatrixType(isMatrixType),
- isImageType(isImageType)
- {
- }
-
- GLenum type;
- GLenum componentType;
- GLenum samplerTextureType;
- GLenum transposedMatrixType;
- GLenum boolVectorType;
- int rowCount;
- int columnCount;
- int componentCount;
- size_t componentSize;
- size_t internalSize;
- size_t externalSize;
- bool isSampler;
- bool isMatrixType;
- bool isImageType;
-};
-
-const UniformTypeInfo &GetUniformTypeInfo(GLenum uniformType);
-
-const char *GetGenericErrorMessage(GLenum error);
-
-unsigned int ElementTypeSize(GLenum elementType);
-
-} // namespace gl
-
-namespace egl
-{
-static const EGLenum FirstCubeMapTextureTarget = EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR;
-static const EGLenum LastCubeMapTextureTarget = EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR;
-bool IsCubeMapTextureTarget(EGLenum target);
-size_t CubeMapTextureTargetToLayerIndex(EGLenum target);
-EGLenum LayerIndexToCubeMapTextureTarget(size_t index);
-bool IsTextureTarget(EGLenum target);
-bool IsRenderbufferTarget(EGLenum target);
-
-const char *GetGenericErrorMessage(EGLint error);
-} // namespace egl
-
-namespace egl_gl
-{
-GLenum EGLCubeMapTargetToGLCubeMapTarget(EGLenum eglTarget);
-GLenum EGLImageTargetToGLTextureTarget(EGLenum eglTarget);
-GLuint EGLClientBufferToGLObjectHandle(EGLClientBuffer buffer);
-}
-
-namespace gl_egl
-{
-EGLenum GLComponentTypeToEGLColorComponentType(GLenum glComponentType);
-} // namespace gl_egl
-
-#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
-std::string getTempPath();
-void writeFile(const char* path, const void* data, size_t size);
-#endif
-
-#if defined (ANGLE_PLATFORM_WINDOWS)
-void ScheduleYield();
-#endif
-
-#endif // COMMON_UTILITIES_H_