summaryrefslogtreecommitdiffstats
path: root/src/core/compositor
Commit message (Collapse)AuthorAgeFilesLines
* Adaptations for Chromium 71Allan Sandfeld Jensen2019-01-286-19/+20
| | | | | | | Change-Id: Ib650113b05dfd4771240804f94e33c07aa317bf2 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Adaptations for Chromium 70Allan Sandfeld Jensen2019-01-286-10/+31
| | | | | | | Change-Id: I8bb77784dbc8a0b9debd96a4c49421bd34e6a0df Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devAllan Sandfeld Jensen2019-01-241-0/+6
| | | | Change-Id: I040db21f90766827c84c48dc0ed2d2d623dc011a
* Fix build with only OpenGL/ES2Samuli Piippo2019-01-212-4/+4
| | | | | | | | Define the needed extension when not available at compile time, move the define after usage was changed in commit 24e878d35. Change-Id: I6ce3c87832b91fb2ac5edf5c4c47bb8e8f935b0a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devMichael Brüning2018-12-181-1/+18
| | | | | | | | | | | Conflicts: src/core/compositor/delegated_frame_node.cpp src/core/profile_adapter.cpp src/core/profile_io_data_qt.cpp src/webengine/api/qquickwebengineprofile.cpp src/webenginewidgets/api/qwebengineprofile.cpp Change-Id: I35ec8480e758bbcb6c5942a5401cb1b6dbdcc428
* Implement ContentGpuClient for WebEngineAllan Sandfeld Jensen2018-11-245-19/+130
| | | | | | | | | This is the way we are supposed to share a sync point manager with the content layer. Change-Id: I595caa863f8b9c8b4f4bc17df76211416a027a12 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove incorrect DCHECK in CompositorResourceTracker::commitResourcesJüri Valdmann2018-11-231-1/+5
| | | | | | | Fixes: QTBUG-71869 Change-Id: I3e2d39eb6c3559f2a31c6b98f5f950183f2381d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge branch '5.12' into devAllan Sandfeld Jensen2018-11-162-5/+10
| | | | | | | | Conflicts: src/core/compositor/compositor.cpp src/core/compositor/compositor.h Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
* Move compositor and scene-graph integration to its own dirAllan Sandfeld Jensen2018-11-0715-0/+3175
Change-Id: Ib552dc30db5ee886631a108b4ccd866459c432e2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 19:39:16 +0000