summaryrefslogtreecommitdiff
path: root/chromium/gpu/command_buffer
Commit message (Collapse)AuthorAgeFilesLines
* Fix mixing chromium gles2 types with qt defined onesv5.11.0-beta2Michal Klocek2018-03-081-2/+1
| | | | | | | | | | Avoid including chromium gles2 headers. This triggers confiflic declaration between khronos_ssize_t which is 64bit and ptrdiff_t which is 32bits on 32bit platforms. Task-number: QTBUG-66597 Change-Id: Icade95463365e05803f7f84889d0d3618ad48d65 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/upstream-master' into 63-basedAllan Sandfeld Jensen2017-12-083-11/+33
|\ | | | | | | Change-Id: I4d88054034fccbb7409fa65c37d4498b74ec0578
| * BASELINE: Update Chromium to 63.0.3239.87Allan Sandfeld Jensen2017-12-083-11/+33
| | | | | | | | | | Change-Id: Iac27464730121b4fac76869d87d622504642e016 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Solve conflicts when including both QtOpenGL headers and resource_provider.hJocelyn Turcotte2017-12-051-1/+0
| | | | | | | | | | | | | | | | | | If resource_provider.h is going to be used to integrate delegated frame to external compositors, it should avoid conflicting with the system's gl.h. Change-Id: Ie37d6cde263157e6717cc006a0896f0b9ebdaa5d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Fix include order of texture_manager.h includes.Michael Brüning2017-12-051-1/+1
|/ | | | | | | | | | The include order was causing conflicts on with symbols being redefined because the chromium command buffer format header was included before the GL ones. Task-number: QTBUG-57035 Change-Id: I06b715463b41d70848585e36b5dd129cb32a97ae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* BASELINE: Update Chromium to 63.0.3239.58Allan Sandfeld Jensen2017-11-2264-982/+2798
| | | | | Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* BASELINE: Update Chromium to 62.0.3202.101Allan Sandfeld Jensen2017-11-22134-1448/+5674
| | | | | Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* BASELINE: Update Chromium to 61.0.3163.99Allan Sandfeld Jensen2017-10-04111-2285/+3289
| | | | | Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* BASELINE: Update Chromium to 60.0.3112.78Alexandru Croitor2017-08-011-0/+4
| | | | | Change-Id: I58f9d14bddb9104a666b6ef869944111ee7eadb8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* BASELINE: Update Chromium to 60.0.3112.70Allan Sandfeld Jensen2017-07-19141-4344/+7470
| | | | | Change-Id: I9911c2280a014d4632f254857876a395d4baed2d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* BASELINE: Update Chromium to 59.0.3071.134Allan Sandfeld Jensen2017-07-1783-1046/+3557
| | | | | Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* BASELINE: Update Chromium to 58.0.3029.98Allan Sandfeld Jensen2017-05-052-0/+7
| | | | | Change-Id: Ib913750d687f29e036959c62a0cabf2412a8faa7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* BASELINE: Update Chromium to 58.0.3029.54Allan Sandfeld Jensen2017-04-1174-1775/+2593
| | | | | Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* BASELINE: Update Chromium to 57.0.2987.144Allan Sandfeld Jensen2017-04-11104-1206/+3534
| | | | | Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* BASELINE: Update Chromium to 56.0.2924.122Allan Sandfeld Jensen2017-03-20104-5326/+4794
| | | | | Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 55.0.2883.105Allan Sandfeld Jensen2017-01-05154-6817/+12550
| | | | | | | And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 53.0.2785.41Allan Sandfeld Jensen2016-08-04137-2182/+17639
| | | | | | | Also adds a few extra files for extensions. Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1Allan Sandfeld Jensen2016-08-04172-5069/+5015
| | | | | Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 51.0.2704.79Allan Sandfeld Jensen2016-06-022-15/+3
| | | | | | | Also adds a few files for url_parsing in extensions. Change-Id: Ie4820c3da75f0a56b3cc86dccc077d671227077b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* BASELINE: Update Chromium to 51.0.2704.41Allan Sandfeld Jensen2016-05-09154-4168/+8611
| | | | | | | Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.48Allan Sandfeld Jensen2016-02-112-0/+4
| | | | | Change-Id: I684541113ff518e3a7d51dfd0b31962b06d10af1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.23Allan Sandfeld Jensen2016-01-25230-9240/+20661
| | | | | | | Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.34 and Ninja to 1.6.0Allan Sandfeld Jensen2015-10-271-0/+2
| | | | | Change-Id: Ie8863b493c7ff19eb46478935dfe7602679b227e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.14Allan Sandfeld Jensen2015-10-14190-14083/+17772
| | | | | | | Also adding in sources needed for spellchecking. Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update chromium to 45.0.2454.40Allan Sandfeld Jensen2015-08-14111-3655/+5552
| | | | | Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update to chromium 44.0.2403.80Allan Sandfeld Jensen2015-07-071-5/+5
| | | | | Change-Id: Ib190ddcbbb5f312742c16d159bdfe9dbf7360c8a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.47Allan Sandfeld Jensen2015-06-18208-8364/+40297
| | | | | Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2014-12-09215-10623/+16282
| | | | | Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update Chromium to beta version 37.0.2062.68Jocelyn Turcotte2014-08-12220-31442/+38577
| | | | | Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-041-0/+3
| | | | | | | | | | | | | | | This is meant as a baseline commit hence it does not include the patches we need to apply for QtWebEngine. All patches should be rebased on top of this commit so we can get rid of the external patches directory. In future these baseline commits always have to include the exact Chromium version returned by version_resolver.py's currentVersion() in their first line, so that we can retrieve the patches on top to apply on the upstream repository. This also includes a ninja update. Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update to new stable branch 1750Andras Becsi2014-03-20120-3360/+3655
| | | | | | | | | This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update Chromium to branch 1650 (31.0.1650.63)Andras Becsi2013-12-1386-947/+2696
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-298-451/+348
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Initial import.Zeno Albisser2013-08-15267-0/+119810
View Lorry Controller Status