summaryrefslogtreecommitdiffstats
path: root/src/core/gl_context_qt.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Adaptations for Chromium 56Allan Sandfeld Jensen2017-03-271-3/+7
| | | | | Change-Id: I78240d7956de4716757761fc6517f031b4adb822 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/content_browser_client_qt.cpp src/core/content_browser_client_qt.h src/core/gl_surface_qt.cpp src/core/print_view_manager_qt.cpp src/core/web_contents_delegate_qt.cpp src/core/web_engine_context.cpp src/webengine/doc/src/qtwebengine-overview.qdoc src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/webenginewidgets.pro sync.profile Change-Id: I44495f4d899580c882d6b86d68d7f6b77c8e91f6
| * Make Linux QPA combinations more robustAllan Sandfeld Jensen2016-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | Use resourceForIntegration to get egldisplay since not all QPA return a egldisplay for context (in particular xcb_egl). Implement EGL fallback for linux desktop builds, to make Wayland work without an X11 server present. Change-Id: Idcead42250fa00a36e50c082711f5618fd213556 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Fix building when QT_NO_OPENGL is definedAndy Nichols2016-10-021-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-54327 Change-Id: I759598d56aa0a74b64092365b422a743fb508ac6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adaptations to Chromium 53Allan Sandfeld Jensen2016-09-141-8/+12
|/ | | | | Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Unify license header usage.Jani Heikkinen2016-02-011-11/+14
| | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix build on WindowsAllan Sandfeld Jensen2015-11-041-3/+1
| | | | | | | | We can't delete a scoped_refptr, but just returning should cause it to do so automatically. Change-Id: I7d7ba28d0264506d608f64847cbfb8a7cb63cf5e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* fix frequent deadlocks on WindowsJoerg Bornemann2015-10-301-2/+8
| | | | | | | | | | | | With a desktop OpenGL build of Qt we encountered frequent deadlocks when creating OpenGL contexts. Initialize the context directly on the calling thread instead of the browser thread and do not synchronize with the browser thread. Task-number: QTBUG-48276 Change-Id: I0970c66cb230881cdc53f22d4a255ea08e6fe63a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix error message for OpenGL resource sharingPeter Varga2015-07-311-1/+5
| | | | | | | | | Method nativeResourceForContext() fails if share context is not set. It may be called earlier than method ShareGroupQtQuick::AboutToAddFirstContext() that performs the same check. Change-Id: Ib1eaabc83e59c75a7610ba214b81e50aa4984baa Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Remove eAndroid hooksAndras Becsi2015-04-141-2/+2
| | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Add Desktop OpenGL backend for WindowsKai Koehne2014-09-251-1/+15
| | | | | | | | Enabling rendering into a WGL backbuffer, in addition to the EGL/angle one. Change-Id: I8f2e3f5ecf52b6db22712b1129059f462725a256 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove unnecessary private header includesJocelyn Turcotte2014-09-111-5/+4
| | | | | | | | Most importantly, get rid of QOpenGLContextPrivate::globalShareContext which will be removed before the final. Change-Id: I5796fa822d2962c21fd8b6d8d3c196686d536e3d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update License Headers for Qt WebEngine to LGPLv3.Zeno Albisser2014-08-211-14/+9
| | | | | | | Change-Id: Idbe0eafb51d77cc00e3a93179b81770724d5bfaa Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Implement GLSurfaceQt and exclude chromium's implementationAndras Becsi2014-08-021-4/+58
| | | | | | | | | | | | | | This makes it possible to use the same EGLConfig that is used by Qt when initializing the EGL surface instead of relying on eglChooseConfig. We can use the native interface to query the used config from Qt to avoid EGL_BAD_MATCH errors during initialization. This depends on patches in the qtbase dev branch, which will become Qt 5.4 at some point, therefore we can only merge this patch if we make Qt 5.4 a hard-dependency of QtWebEngine. Change-Id: I94319433b0790994ecbf543b74e7d12fa4767e32 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Enable GLContextHelper and register a SurfaceFactoryQt on eAndroidAndras Becsi2014-05-151-2/+11
| | | | | | | | | | | | This is needed to run on certain hardware that needs the shared EGL contexts to be created on the same thread. To prevent a deadlock on eAndroid only use a blocking connection if we are not on the main thread where the singleton was created, since there is a call to this from gpu_info_collector_android before the GPU thread is launched. Change-Id: I6887ad1218b8426097f454741dc5a79ee94f9d62 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add GLContextHelper class for EGL context creation.Zeno Albisser2014-04-091-0/+90
Shared EGL contexts should always be created on the same thread, as otherwise context creation might fail. We use a GLContextHelper singleton that is initialized on startup and creates the contexts when requested through a BlockingQueuedConnection. There is a pretty and a correct solution for this problem. This is the pretty one. It is based on the assumption that Chromium decides to use the same or a similar enough configuration for the EGLContext as Qt previously did. But we prefer pretty over correct as the correct solution would potentially impose a layering violation. This is enabled for all embedded linux devices. Change-Id: I910cc90d0f87fd6d1fe0a475b17ba56cd8c503f6 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 19:09:56 +0000