summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libANGLE/queryconversions.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/libANGLE/queryconversions.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/libANGLE/queryconversions.cpp')
-rw-r--r--src/3rdparty/angle/src/libANGLE/queryconversions.cpp283
1 files changed, 0 insertions, 283 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/queryconversions.cpp b/src/3rdparty/angle/src/libANGLE/queryconversions.cpp
deleted file mode 100644
index 78d219365e..0000000000
--- a/src/3rdparty/angle/src/libANGLE/queryconversions.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-// Copyright (c) 2014 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.
-//
-
-// queryconversions.cpp: Implementation of state query cast conversions
-
-#include "libANGLE/queryconversions.h"
-
-#include <vector>
-
-#include "libANGLE/Context.h"
-#include "common/utilities.h"
-
-namespace gl
-{
-
-namespace
-{
-
-GLint64 ExpandFloatToInteger(GLfloat value)
-{
- return static_cast<GLint64>((static_cast<double>(0xFFFFFFFFULL) * value - 1.0) / 2.0);
-}
-
-template <typename QueryT, typename NativeT>
-QueryT CastFromStateValueToInt(GLenum pname, NativeT value)
-{
- GLenum nativeType = GLTypeToGLenum<NativeT>::value;
-
- if (nativeType == GL_FLOAT)
- {
- // RGBA color values and DepthRangeF values are converted to integer using Equation 2.4 from Table 4.5
- if (pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE || pname == GL_BLEND_COLOR)
- {
- return clampCast<QueryT>(ExpandFloatToInteger(static_cast<GLfloat>(value)));
- }
- else
- {
- return clampCast<QueryT>(std::round(value));
- }
- }
-
- return clampCast<QueryT>(value);
-}
-
-template <typename NativeT, typename QueryT>
-NativeT CastQueryValueToInt(GLenum pname, QueryT value)
-{
- GLenum queryType = GLTypeToGLenum<QueryT>::value;
-
- if (queryType == GL_FLOAT)
- {
- return static_cast<NativeT>(std::round(value));
- }
-
- return static_cast<NativeT>(value);
-}
-
-} // anonymous namespace
-
-// ES 3.10 Section 2.2.2
-// When querying bitmasks(such as SAMPLE_MASK_VALUE or STENCIL_WRITEMASK) with GetIntegerv, the
-// mask value is treated as a signed integer, so that mask values with the high bit set will not be
-// clamped when returned as signed integers.
-GLint CastMaskValue(const Context *context, GLuint value)
-{
- return (context->getClientVersion() >= Version(3, 1) ? static_cast<GLint>(value)
- : clampCast<GLint>(value));
-}
-
-template <typename QueryT, typename InternalT>
-QueryT CastFromGLintStateValue(GLenum pname, InternalT value)
-{
- return CastFromStateValue<QueryT, GLint>(pname, clampCast<GLint, InternalT>(value));
-}
-
-template GLfloat CastFromGLintStateValue<GLfloat, GLenum>(GLenum pname, GLenum value);
-template GLint CastFromGLintStateValue<GLint, GLenum>(GLenum pname, GLenum value);
-template GLint64 CastFromGLintStateValue<GLint64, GLenum>(GLenum pname, GLenum value);
-template GLuint CastFromGLintStateValue<GLuint, GLenum>(GLenum pname, GLenum value);
-template GLfloat CastFromGLintStateValue<GLfloat, bool>(GLenum pname, bool value);
-template GLuint CastFromGLintStateValue<GLuint, bool>(GLenum pname, bool value);
-template GLint CastFromGLintStateValue<GLint, bool>(GLenum pname, bool value);
-
-template <typename QueryT, typename NativeT>
-QueryT CastFromStateValue(GLenum pname, NativeT value)
-{
- GLenum queryType = GLTypeToGLenum<QueryT>::value;
-
- switch (queryType)
- {
- case GL_INT:
- case GL_INT_64_ANGLEX:
- case GL_UNSIGNED_INT:
- case GL_UINT_64_ANGLEX:
- return CastFromStateValueToInt<QueryT, NativeT>(pname, value);
- case GL_FLOAT:
- return static_cast<QueryT>(value);
- case GL_BOOL:
- return static_cast<QueryT>(value == static_cast<NativeT>(0) ? GL_FALSE : GL_TRUE);
- default:
- UNREACHABLE();
- return 0;
- }
-}
-template GLint CastFromStateValue<GLint, GLint>(GLenum pname, GLint value);
-template GLint CastFromStateValue<GLint, GLint64>(GLenum pname, GLint64 value);
-template GLint64 CastFromStateValue<GLint64, GLint>(GLenum pname, GLint value);
-template GLint64 CastFromStateValue<GLint64, GLint64>(GLenum pname, GLint64 value);
-template GLfloat CastFromStateValue<GLfloat, GLint>(GLenum pname, GLint value);
-template GLfloat CastFromStateValue<GLfloat, GLfloat>(GLenum pname, GLfloat value);
-template GLint CastFromStateValue<GLint, GLfloat>(GLenum pname, GLfloat value);
-template GLuint CastFromStateValue<GLuint, GLint>(GLenum pname, GLint value);
-template GLuint CastFromStateValue<GLuint, GLuint>(GLenum pname, GLuint value);
-template GLint CastFromStateValue<GLint, GLboolean>(GLenum pname, GLboolean value);
-template GLint64 CastFromStateValue<GLint64, GLboolean>(GLenum pname, GLboolean value);
-template GLint CastFromStateValue<GLint, GLuint>(GLenum pname, GLuint value);
-template GLint64 CastFromStateValue<GLint64, GLuint>(GLenum pname, GLuint value);
-template GLuint64 CastFromStateValue<GLuint64, GLuint>(GLenum pname, GLuint value);
-
-template <typename NativeT, typename QueryT>
-NativeT CastQueryValueTo(GLenum pname, QueryT value)
-{
- GLenum nativeType = GLTypeToGLenum<NativeT>::value;
-
- switch (nativeType)
- {
- case GL_INT:
- case GL_INT_64_ANGLEX:
- case GL_UNSIGNED_INT:
- case GL_UINT_64_ANGLEX:
- return CastQueryValueToInt<NativeT, QueryT>(pname, value);
- case GL_FLOAT:
- return static_cast<NativeT>(value);
- case GL_BOOL:
- return static_cast<NativeT>(value == static_cast<QueryT>(0) ? GL_FALSE : GL_TRUE);
- default:
- UNREACHABLE();
- return 0;
- }
-}
-
-template GLint CastQueryValueTo<GLint, GLfloat>(GLenum pname, GLfloat value);
-template GLboolean CastQueryValueTo<GLboolean, GLint>(GLenum pname, GLint value);
-template GLint CastQueryValueTo<GLint, GLint>(GLenum pname, GLint value);
-template GLfloat CastQueryValueTo<GLfloat, GLint>(GLenum pname, GLint value);
-template GLfloat CastQueryValueTo<GLfloat, GLfloat>(GLenum pname, GLfloat value);
-template GLuint CastQueryValueTo<GLuint, GLint>(GLenum pname, GLint value);
-template GLuint CastQueryValueTo<GLuint, GLfloat>(GLenum pname, GLfloat value);
-
-template <typename QueryT>
-void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
- unsigned int numParams, QueryT *outParams)
-{
- if (nativeType == GL_INT)
- {
- std::vector<GLint> intParams(numParams, 0);
- context->getIntegervImpl(pname, intParams.data());
-
- for (unsigned int i = 0; i < numParams; ++i)
- {
- outParams[i] = CastFromStateValue<QueryT>(pname, intParams[i]);
- }
- }
- else if (nativeType == GL_BOOL)
- {
- std::vector<GLboolean> boolParams(numParams, GL_FALSE);
- context->getBooleanvImpl(pname, boolParams.data());
-
- for (unsigned int i = 0; i < numParams; ++i)
- {
- outParams[i] = (boolParams[i] == GL_FALSE ? static_cast<QueryT>(0) : static_cast<QueryT>(1));
- }
- }
- else if (nativeType == GL_FLOAT)
- {
- std::vector<GLfloat> floatParams(numParams, 0.0f);
- context->getFloatvImpl(pname, floatParams.data());
-
- for (unsigned int i = 0; i < numParams; ++i)
- {
- outParams[i] = CastFromStateValue<QueryT>(pname, floatParams[i]);
- }
- }
- else if (nativeType == GL_INT_64_ANGLEX)
- {
- std::vector<GLint64> int64Params(numParams, 0);
- context->getInteger64v(pname, int64Params.data());
-
- for (unsigned int i = 0; i < numParams; ++i)
- {
- outParams[i] = CastFromStateValue<QueryT>(pname, int64Params[i]);
- }
- }
- else UNREACHABLE();
-}
-
-// Explicit template instantiation (how we export template functions in different files)
-// The calls below will make CastStateValues successfully link with the GL state query types
-// The GL state query API types are: bool, int, uint, float, int64, uint64
-
-template void CastStateValues<GLboolean>(Context *, GLenum, GLenum, unsigned int, GLboolean *);
-template void CastStateValues<GLint>(Context *, GLenum, GLenum, unsigned int, GLint *);
-template void CastStateValues<GLuint>(Context *, GLenum, GLenum, unsigned int, GLuint *);
-template void CastStateValues<GLfloat>(Context *, GLenum, GLenum, unsigned int, GLfloat *);
-template void CastStateValues<GLint64>(Context *, GLenum, GLenum, unsigned int, GLint64 *);
-
-template <typename QueryT>
-void CastIndexedStateValues(Context *context,
- GLenum nativeType,
- GLenum pname,
- GLuint index,
- unsigned int numParams,
- QueryT *outParams)
-{
- if (nativeType == GL_INT)
- {
- std::vector<GLint> intParams(numParams, 0);
- context->getIntegeri_v(pname, index, intParams.data());
-
- for (unsigned int i = 0; i < numParams; ++i)
- {
- outParams[i] = CastFromStateValue<QueryT>(pname, intParams[i]);
- }
- }
- else if (nativeType == GL_BOOL)
- {
- std::vector<GLboolean> boolParams(numParams, GL_FALSE);
- context->getBooleani_v(pname, index, boolParams.data());
-
- for (unsigned int i = 0; i < numParams; ++i)
- {
- outParams[i] =
- (boolParams[i] == GL_FALSE ? static_cast<QueryT>(0) : static_cast<QueryT>(1));
- }
- }
- else if (nativeType == GL_INT_64_ANGLEX)
- {
- std::vector<GLint64> int64Params(numParams, 0);
- context->getInteger64i_v(pname, index, int64Params.data());
-
- for (unsigned int i = 0; i < numParams; ++i)
- {
- outParams[i] = CastFromStateValue<QueryT>(pname, int64Params[i]);
- }
- }
- else
- UNREACHABLE();
-}
-
-template void CastIndexedStateValues<GLboolean>(Context *,
- GLenum,
- GLenum,
- GLuint index,
- unsigned int,
- GLboolean *);
-template void CastIndexedStateValues<GLint>(Context *,
- GLenum,
- GLenum,
- GLuint index,
- unsigned int,
- GLint *);
-template void CastIndexedStateValues<GLuint>(Context *,
- GLenum,
- GLenum,
- GLuint index,
- unsigned int,
- GLuint *);
-template void CastIndexedStateValues<GLfloat>(Context *,
- GLenum,
- GLenum,
- GLuint index,
- unsigned int,
- GLfloat *);
-template void CastIndexedStateValues<GLint64>(Context *,
- GLenum,
- GLenum,
- GLuint index,
- unsigned int,
- GLint64 *);
-}