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/validationEGL.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/validationEGL.h')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/validationEGL.h | 182 |
1 files changed, 0 insertions, 182 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/validationEGL.h b/src/3rdparty/angle/src/libANGLE/validationEGL.h deleted file mode 100644 index 3ab8232c7f..0000000000 --- a/src/3rdparty/angle/src/libANGLE/validationEGL.h +++ /dev/null @@ -1,182 +0,0 @@ -// -// Copyright (c) 2015 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. -// - -// validationEGL.h: Validation functions for generic EGL entry point parameters - -#ifndef LIBANGLE_VALIDATIONEGL_H_ -#define LIBANGLE_VALIDATIONEGL_H_ - -#include "libANGLE/Error.h" - -#include <EGL/egl.h> -#include <EGL/eglext.h> - -namespace gl -{ -class Context; -} - -namespace egl -{ - -class AttributeMap; -struct ClientExtensions; -struct Config; -class Device; -class Display; -class Image; -class Stream; -class Surface; - -// Object validation -Error ValidateDisplay(const Display *display); -Error ValidateSurface(const Display *display, const Surface *surface); -Error ValidateConfig(const Display *display, const Config *config); -Error ValidateContext(const Display *display, const gl::Context *context); -Error ValidateImage(const Display *display, const Image *image); - -// Entry point validation -Error ValidateCreateContext(Display *display, Config *configuration, gl::Context *shareContext, - const AttributeMap& attributes); - -Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWindowType window, - const AttributeMap& attributes); - -Error ValidateCreatePbufferSurface(Display *display, Config *config, const AttributeMap& attributes); -Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, EGLClientBuffer buffer, - Config *config, const AttributeMap& attributes); - -Error ValidateMakeCurrent(Display *display, EGLSurface draw, EGLSurface read, gl::Context *context); - -Error ValidateCreateImageKHR(const Display *display, - gl::Context *context, - EGLenum target, - EGLClientBuffer buffer, - const AttributeMap &attributes); -Error ValidateDestroyImageKHR(const Display *display, const Image *image); - -Error ValidateCreateDeviceANGLE(EGLint device_type, - void *native_device, - const EGLAttrib *attrib_list); -Error ValidateReleaseDeviceANGLE(Device *device); - -Error ValidateCreateStreamKHR(const Display *display, const AttributeMap &attributes); -Error ValidateDestroyStreamKHR(const Display *display, const Stream *stream); -Error ValidateStreamAttribKHR(const Display *display, - const Stream *stream, - EGLint attribute, - EGLint value); -Error ValidateQueryStreamKHR(const Display *display, - const Stream *stream, - EGLenum attribute, - EGLint *value); -Error ValidateQueryStreamu64KHR(const Display *display, - const Stream *stream, - EGLenum attribute, - EGLuint64KHR *value); -Error ValidateStreamConsumerGLTextureExternalKHR(const Display *display, - gl::Context *context, - const Stream *stream); -Error ValidateStreamConsumerAcquireKHR(const Display *display, - gl::Context *context, - const Stream *stream); -Error ValidateStreamConsumerReleaseKHR(const Display *display, - gl::Context *context, - const Stream *stream); -Error ValidateStreamConsumerGLTextureExternalAttribsNV(const Display *display, - gl::Context *context, - const Stream *stream, - const AttributeMap &attribs); -Error ValidateCreateStreamProducerD3DTextureNV12ANGLE(const Display *display, - const Stream *stream, - const AttributeMap &attribs); -Error ValidateStreamPostD3DTextureNV12ANGLE(const Display *display, - const Stream *stream, - void *texture, - const AttributeMap &attribs); - -Error ValidateGetSyncValuesCHROMIUM(const Display *display, - const Surface *surface, - const EGLuint64KHR *ust, - const EGLuint64KHR *msc, - const EGLuint64KHR *sbc); - -Error ValidateSwapBuffersWithDamageEXT(const Display *display, - const Surface *surface, - EGLint *rects, - EGLint n_rects); - -Error ValidateGetConfigAttrib(const Display *display, const Config *config, EGLint attribute); -Error ValidateChooseConfig(const Display *display, - const AttributeMap &attribs, - EGLint configSize, - EGLint *numConfig); -Error ValidateGetConfigs(const Display *display, EGLint configSize, EGLint *numConfig); - -// Other validation -Error ValidateCompatibleConfigs(const Display *display, - const Config *config1, - const Surface *surface, - const Config *config2, - EGLint surfaceType); - -Error ValidateGetPlatformDisplay(EGLenum platform, - void *native_display, - const EGLAttrib *attrib_list); -Error ValidateGetPlatformDisplayEXT(EGLenum platform, - void *native_display, - const EGLint *attrib_list); - -Error ValidateProgramCacheGetAttribANGLE(const Display *display, EGLenum attrib); - -Error ValidateProgramCacheQueryANGLE(const Display *display, - EGLint index, - void *key, - EGLint *keysize, - void *binary, - EGLint *binarysize); - -Error ValidateProgramCachePopulateANGLE(const Display *display, - const void *key, - EGLint keysize, - const void *binary, - EGLint binarysize); - -Error ValidateProgramCacheResizeANGLE(const Display *display, EGLint limit, EGLenum mode); - -Error ValidateSurfaceAttrib(const Display *display, - const Surface *surface, - EGLint attribute, - EGLint value); -Error ValidateQuerySurface(const Display *display, - const Surface *surface, - EGLint attribute, - EGLint *value); -Error ValidateQueryContext(const Display *display, - const gl::Context *context, - EGLint attribute, - EGLint *value); - -} // namespace egl - -#define ANGLE_EGL_TRY(THREAD, EXPR) \ - { \ - auto ANGLE_LOCAL_VAR = (EXPR); \ - if (ANGLE_LOCAL_VAR.isError()) \ - return THREAD->setError(ANGLE_LOCAL_VAR); \ - } - -#define ANGLE_EGL_TRY_RETURN(THREAD, EXPR, RETVAL) \ - { \ - auto ANGLE_LOCAL_VAR = (EXPR); \ - if (ANGLE_LOCAL_VAR.isError()) \ - { \ - THREAD->setError(ANGLE_LOCAL_VAR); \ - return RETVAL; \ - } \ - } - -#endif // LIBANGLE_VALIDATIONEGL_H_ |