summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libANGLE/Config.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/libANGLE/Config.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/libANGLE/Config.h')
-rw-r--r--src/3rdparty/angle/src/libANGLE/Config.h101
1 files changed, 0 insertions, 101 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/Config.h b/src/3rdparty/angle/src/libANGLE/Config.h
deleted file mode 100644
index f2fbe8b95a..0000000000
--- a/src/3rdparty/angle/src/libANGLE/Config.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2002-2010 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.
-//
-
-// Config.h: Defines the egl::Config class, describing the format, type
-// and size for an egl::Surface. Implements EGLConfig and related functionality.
-// [EGL 1.5] section 3.4 page 19.
-
-#ifndef INCLUDE_CONFIG_H_
-#define INCLUDE_CONFIG_H_
-
-#include "libANGLE/AttributeMap.h"
-
-#include "common/angleutils.h"
-
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-
-#include <map>
-#include <vector>
-
-namespace egl
-{
-
-struct Config
-{
- Config();
- ~Config();
- Config(const Config &other);
- Config &operator=(const Config &other);
-
- GLenum renderTargetFormat; // TODO(geofflang): remove this
- GLenum depthStencilFormat; // TODO(geofflang): remove this
-
- EGLint bufferSize; // Depth of the color buffer
- EGLint redSize; // Bits of Red in the color buffer
- EGLint greenSize; // Bits of Green in the color buffer
- EGLint blueSize; // Bits of Blue in the color buffer
- EGLint luminanceSize; // Bits of Luminance in the color buffer
- EGLint alphaSize; // Bits of Alpha in the color buffer
- EGLint alphaMaskSize; // Bits of Alpha Mask in the mask buffer
- EGLBoolean bindToTextureRGB; // True if bindable to RGB textures.
- EGLBoolean bindToTextureRGBA; // True if bindable to RGBA textures.
- EGLenum colorBufferType; // Color buffer type
- EGLenum configCaveat; // Any caveats for the configuration
- EGLint configID; // Unique EGLConfig identifier
- EGLint conformant; // Whether contexts created with this config are conformant
- EGLint depthSize; // Bits of Z in the depth buffer
- EGLint level; // Frame buffer level
- EGLBoolean matchNativePixmap; // Match the native pixmap format
- EGLint maxPBufferWidth; // Maximum width of pbuffer
- EGLint maxPBufferHeight; // Maximum height of pbuffer
- EGLint maxPBufferPixels; // Maximum size of pbuffer
- EGLint maxSwapInterval; // Maximum swap interval
- EGLint minSwapInterval; // Minimum swap interval
- EGLBoolean nativeRenderable; // EGL_TRUE if native rendering APIs can render to surface
- EGLint nativeVisualID; // Handle of corresponding native visual
- EGLint nativeVisualType; // Native visual type of the associated visual
- EGLint renderableType; // Which client rendering APIs are supported.
- EGLint sampleBuffers; // Number of multisample buffers
- EGLint samples; // Number of samples per pixel
- EGLint stencilSize; // Bits of Stencil in the stencil buffer
- EGLint surfaceType; // Which types of EGL surfaces are supported.
- EGLenum transparentType; // Type of transparency supported
- EGLint transparentRedValue; // Transparent red value
- EGLint transparentGreenValue; // Transparent green value
- EGLint transparentBlueValue; // Transparent blue value
- EGLint optimalOrientation; // Optimal window surface orientation
- EGLenum colorComponentType; // Color component type
-};
-
-class ConfigSet
-{
- public:
- ConfigSet();
- ConfigSet(const ConfigSet &other);
- ~ConfigSet();
- ConfigSet &operator=(const ConfigSet &other);
-
- EGLint add(const Config &config);
- const Config &get(EGLint id) const;
-
- void clear();
-
- size_t size() const;
-
- bool contains(const Config *config) const;
-
- // Filter configurations based on the table in [EGL 1.5] section 3.4.1.2 page 29
- std::vector<const Config*> filter(const AttributeMap &attributeMap) const;
-
- private:
- typedef std::map<EGLint, Config> ConfigMap;
- ConfigMap mConfigs;
-};
-
-}
-
-#endif // INCLUDE_CONFIG_H_