summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libEGL/libEGL.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/libEGL/libEGL.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/libEGL/libEGL.cpp')
-rw-r--r--src/3rdparty/angle/src/libEGL/libEGL.cpp408
1 files changed, 0 insertions, 408 deletions
diff --git a/src/3rdparty/angle/src/libEGL/libEGL.cpp b/src/3rdparty/angle/src/libEGL/libEGL.cpp
deleted file mode 100644
index efe0b0c124..0000000000
--- a/src/3rdparty/angle/src/libEGL/libEGL.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-//
-// Copyright (c) 2002-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.
-//
-
-// libEGL.cpp: Implements the exported EGL functions.
-
-#include "libGLESv2/entry_points_egl.h"
-#include "libGLESv2/entry_points_egl_ext.h"
-
-extern "C"
-{
-
-EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)
-{
- return egl::ChooseConfig(dpy, attrib_list, configs, config_size, num_config);
-}
-
-EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
-{
- return egl::CopyBuffers(dpy, surface, target);
-}
-
-EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)
-{
- return egl::CreateContext(dpy, config, share_context, attrib_list);
-}
-
-EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)
-{
- return egl::CreatePbufferSurface(dpy, config, attrib_list);
-}
-
-EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)
-{
- return egl::CreatePixmapSurface(dpy, config, pixmap, attrib_list);
-}
-
-EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list)
-{
- return egl::CreateWindowSurface(dpy, config, win, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)
-{
- return egl::DestroyContext(dpy, ctx);
-}
-
-EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
-{
- return egl::DestroySurface(dpy, surface);
-}
-
-EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)
-{
- return egl::GetConfigAttrib(dpy, config, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)
-{
- return egl::GetConfigs(dpy, configs, config_size, num_config);
-}
-
-EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)
-{
- return egl::GetCurrentDisplay();
-}
-
-EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)
-{
- return egl::GetCurrentSurface(readdraw);
-}
-
-EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)
-{
- return egl::GetDisplay(display_id);
-}
-
-EGLint EGLAPIENTRY eglGetError(void)
-{
- return egl::GetError();
-}
-
-EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
-{
- return egl::Initialize(dpy, major, minor);
-}
-
-EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
-{
- return egl::MakeCurrent(dpy, draw, read, ctx);
-}
-
-EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
-{
- return egl::QueryContext(dpy, ctx, attribute, value);
-}
-
-const char* EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)
-{
- return egl::QueryString(dpy, name);
-}
-
-EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)
-{
- return egl::QuerySurface(dpy, surface, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
-{
- return egl::SwapBuffers(dpy, surface);
-}
-
-EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)
-{
- return egl::Terminate(dpy);
-}
-
-EGLBoolean EGLAPIENTRY eglWaitGL(void)
-{
- return egl::WaitGL();
-}
-
-EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)
-{
- return egl::WaitNative(engine);
-}
-
-EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
-{
- return egl::BindTexImage(dpy, surface, buffer);
-}
-
-EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
-{
- return egl::ReleaseTexImage(dpy, surface, buffer);
-}
-
-EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)
-{
- return egl::SurfaceAttrib(dpy, surface, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)
-{
- return egl::SwapInterval(dpy, interval);
-}
-
-EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)
-{
- return egl::BindAPI(api);
-}
-
-EGLenum EGLAPIENTRY eglQueryAPI(void)
-{
- return egl::QueryAPI();
-}
-
-EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)
-{
- return egl::CreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglReleaseThread(void)
-{
- return egl::ReleaseThread();
-}
-
-EGLBoolean EGLAPIENTRY eglWaitClient(void)
-{
- return egl::WaitClient();
-}
-
-EGLContext EGLAPIENTRY eglGetCurrentContext(void)
-{
- return egl::GetCurrentContext();
-}
-
-EGLSync EGLAPIENTRY eglCreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
-{
- return egl::CreateSync(dpy, type, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglDestroySync(EGLDisplay dpy, EGLSync sync)
-{
- return egl::DestroySync(dpy, sync);
-}
-
-EGLint EGLAPIENTRY eglClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
-{
- return egl::ClientWaitSync(dpy, sync, flags, timeout);
-}
-
-EGLBoolean EGLAPIENTRY eglGetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value)
-{
- return egl::GetSyncAttrib(dpy, sync, attribute, value);
-}
-
-EGLImage EGLAPIENTRY eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list)
-{
- return egl::CreateImage(dpy, ctx, target, buffer, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglDestroyImage(EGLDisplay dpy, EGLImage image)
-{
- return egl::DestroyImage(dpy, image);
-}
-
-EGLDisplay EGLAPIENTRY eglGetPlatformDisplay(EGLenum platform, void *native_display, const EGLAttrib *attrib_list)
-{
- return egl::GetPlatformDisplay(platform, native_display, attrib_list);
-}
-
-EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list)
-{
- return egl::CreatePlatformWindowSurface(dpy, config, native_window, attrib_list);
-}
-
-EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list)
-{
- return egl::CreatePlatformPixmapSurface(dpy, config, native_pixmap, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
-{
- return egl::WaitSync(dpy, sync, flags);
-}
-
-EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value)
-{
- return egl::QuerySurfacePointerANGLE(dpy, surface, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglPostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height)
-{
- return egl::PostSubBufferNV(dpy, surface, x, y, width, height);
-}
-
-EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)
-{
- return egl::GetPlatformDisplayEXT(platform, native_display, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value)
-{
- return egl::QueryDisplayAttribEXT(dpy, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglQueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value)
-{
- return egl::QueryDeviceAttribEXT(device, attribute, value);
-}
-
-const char * EGLAPIENTRY eglQueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
-{
- return egl::QueryDeviceStringEXT(device, name);
-}
-
-EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy,
- EGLContext ctx,
- EGLenum target,
- EGLClientBuffer buffer,
- const EGLint *attrib_list)
-{
- return egl::CreateImageKHR(dpy, ctx, target, buffer, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
-{
- return egl::DestroyImageKHR(dpy, image);
-}
-
-EGLDeviceEXT EGLAPIENTRY eglCreateDeviceANGLE(EGLint device_type,
- void *native_device,
- const EGLAttrib *attrib_list)
-{
- return egl::CreateDeviceANGLE(device_type, native_device, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglReleaseDeviceANGLE(EGLDeviceEXT device)
-{
- return egl::ReleaseDeviceANGLE(device);
-}
-
-__eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)
-{
- return egl::GetProcAddress(procname);
-}
-
-EGLStreamKHR EGLAPIENTRY eglCreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list)
-{
- return egl::CreateStreamKHR(dpy, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglDestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream)
-{
- return egl::DestroyStreamKHR(dpy, stream);
-}
-
-EGLBoolean EGLAPIENTRY eglStreamAttribKHR(EGLDisplay dpy,
- EGLStreamKHR stream,
- EGLenum attribute,
- EGLint value)
-{
- return egl::StreamAttribKHR(dpy, stream, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglQueryStreamKHR(EGLDisplay dpy,
- EGLStreamKHR stream,
- EGLenum attribute,
- EGLint *value)
-{
- return egl::QueryStreamKHR(dpy, stream, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR(EGLDisplay dpy,
- EGLStreamKHR stream,
- EGLenum attribute,
- EGLuint64KHR *value)
-{
- return egl::QueryStreamu64KHR(dpy, stream, attribute, value);
-}
-
-EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream)
-{
- return egl::StreamConsumerGLTextureExternalKHR(dpy, stream);
-}
-
-EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream)
-{
- return egl::StreamConsumerAcquireKHR(dpy, stream);
-}
-
-EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream)
-{
- return egl::StreamConsumerReleaseKHR(dpy, stream);
-}
-
-EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
- EGLStreamKHR stream,
- EGLAttrib *attrib_list)
-{
- return egl::StreamConsumerGLTextureExternalAttribsNV(dpy, stream, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglCreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy,
- EGLStreamKHR stream,
- const EGLAttrib *attrib_list)
-{
- return egl::CreateStreamProducerD3DTextureNV12ANGLE(dpy, stream, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglStreamPostD3DTextureNV12ANGLE(EGLDisplay dpy,
- EGLStreamKHR stream,
- void *texture,
- const EGLAttrib *attrib_list)
-{
- return egl::StreamPostD3DTextureNV12ANGLE(dpy, stream, texture, attrib_list);
-}
-
-EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy,
- EGLSurface surface,
- EGLuint64KHR *ust,
- EGLuint64KHR *msc,
- EGLuint64KHR *sbc)
-{
- return egl::GetSyncValuesCHROMIUM(dpy, surface, ust, msc, sbc);
-}
-
-EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT(EGLDisplay dpy,
- EGLSurface surface,
- EGLint *rects,
- EGLint n_rects)
-{
- return egl::SwapBuffersWithDamageEXT(dpy, surface, rects, n_rects);
-}
-
-EGLint EGLAPIENTRY eglProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib)
-{
- return egl::ProgramCacheGetAttribANGLE(dpy, attrib);
-}
-
-void EGLAPIENTRY eglProgramCacheQueryANGLE(EGLDisplay dpy,
- EGLint index,
- void *key,
- EGLint *keysize,
- void *binary,
- EGLint *binarysize)
-{
- egl::ProgramCacheQueryANGLE(dpy, index, key, keysize, binary, binarysize);
-}
-
-void EGLAPIENTRY eglProgramCachePopulateANGLE(EGLDisplay dpy,
- const void *key,
- EGLint keysize,
- const void *binary,
- EGLint binarysize)
-{
- egl::ProgramCachePopulateANGLE(dpy, key, keysize, binary, binarysize);
-}
-
-EGLint EGLAPIENTRY eglProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode)
-{
- return egl::ProgramCacheResizeANGLE(dpy, limit, mode);
-}
-
-} // extern "C"