summaryrefslogtreecommitdiff
path: root/chromium/gpu
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-master' into 51-basedAllan Sandfeld Jensen2016-06-023-16/+16
|\ | | | | | | Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
| * BASELINE: Update Chromium to 51.0.2704.79Allan Sandfeld Jensen2016-06-023-16/+16
| | | | | | | | | | | | | | Also adds a few files for url_parsing in extensions. Change-Id: Ie4820c3da75f0a56b3cc86dccc077d671227077b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Fix conflicting GL headersAllan Sandfeld Jensen2016-05-108-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLES/gl2.h is included through Qt public headers and the copy of Chromium is used since its include path comes before /usr/include. The problem is that this header is incompatible for several reasons, one of them being that it converts all GL function symbols from gl* to GLES2*. Qt layer code should always need to go through GL directly, so make sure that only GYP targets that depend directly on gpu.gyp, khronos.gyp or webkit_gpu.gyp will have an include path pointing to those headers. Replace all_dependent_settings with direct_dependent_settings and ensure former indirect dependencies are made direct. This patch collapses several patches by Jocelyn Turcotte and Andras Becsi Change-Id: I82ae8a5a62f7d968375b971757b2126670a02461 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Solve conflicts when including both QtOpenGL headers and ↵Jocelyn Turcotte2016-05-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | resource_provider.h 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: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix dependencies on ANGLEAllan Sandfeld Jensen2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Removes dependency on libEGL and libGLESv2 on both Windows and X11, and links to the Qt versions on windows if doing an ANGLE build. Technically we don't need ANGLE in that case either because we disable GPU acceleration when Qt is using ANGLE, but since it is runtime disabled it still need to be there at compile and link time. Change-Id: I866442d7172609b81eaf83fdba3d8d85cc848cf2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Disable GPU blacklisting for llvmpipe on WindowsMichael Brüning2016-05-101-0/+9
| | | | | | | | | | | | | | | | | | | | This works around the per-se disabling of hardware acceleration on older versions of Windows when the Gallium llvmpipe driver is used. Change-Id: I23dca61cf2309ad6f73279bb001358385866e438 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Only forward declare GL types if they are not defined yetAndras Becsi2016-05-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | Protect forward typedefs in gles2_cmd_format.h with GL_VERSION_1_5, this way if we make sure that this header gets included after gl_bindings.h we can prevent conflicting declarations of GL types in the core layer of QtWebEngine. Change-Id: I2fd8b14e6a5367ceea98068b41e2dd395a1998c8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Fix conflicting types for 64 bit Windows Desktop GL.Michael Brüning2016-05-101-0/+6
| | | | | | | | | | | | | | | | | | Fixes the redefinition of pointer types to appropriate values on 64 Bit Windows. Change-Id: Ia1735a5ae5c9dc12dab80e7670dea8270ebf089f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add accessors and seams for the Qt delegated renderer integration.Jocelyn Turcotte2016-05-102-2/+10
|/ | | | | | | | | | This is needed to fetch the MessageLoop, the MailboxManager and the SyncPointManager of the GPU in-process host. And fetch the right shared context for the in GPU thread. Change-Id: I7f38e32b2df11da5b046f16643841d34260c11fb Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 51.0.2704.41Allan Sandfeld Jensen2016-05-09332-6993/+26411
| | | | | | | 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.91Allan Sandfeld Jensen2016-03-084-2/+65
| | | | | | | And adds sources hunspell dictionary convertion tool. Change-Id: Ifb016b018e7b7cc5a2c56d8e4c1b1b563bd5eaed 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-25331-10467/+23886
| | | | | | | Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.109Allan Sandfeld Jensen2016-01-052-2/+15
| | | | | | | Also adds sources for CDM. Change-Id: Id1c834411de135c71deb23b884f2dce902190136 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.71Allan Sandfeld Jensen2015-11-233-2/+37
| | | | | | | | Also adds a few missing spellcheck sources. Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.34 and Ninja to 1.6.0Allan Sandfeld Jensen2015-10-273-1/+17
| | | | | Change-Id: Ie8863b493c7ff19eb46478935dfe7602679b227e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.14Allan Sandfeld Jensen2015-10-14250-15424/+20718
| | | | | | | 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-14155-4068/+7113
| | | | | Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-292-1/+19
| | | | | | | | Also adds missing compile_test tool, and removed two unused third_party modules. Change-Id: Ie6135c2a57c8c9519aa093eb0a259a605b26a111 Reviewed-by: Joerg Bornemann <joerg.bornemann@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-18298-9380/+45911
| | | | | 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-09303-11977/+20386
| | | | | Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update Chromium to beta version 37.0.2062.68Jocelyn Turcotte2014-08-12290-32793/+42091
| | | | | Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-046-34/+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-20183-4229/+5702
| | | | | | | | | 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-13111-1354/+3353
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-2910-452/+362
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build after the GL ES2 fix.Jocelyn Turcotte2013-11-011-0/+9
| | | | | | | The patch was incomplete and didn't survive a clean build. Change-Id: I86a5bc13755c0d028d53146eb1d0d708bf429dd9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix the build with a GL ES2 configured Qt.Jocelyn Turcotte2013-11-013-0/+15
| | | | | | | | | | | | | | | | | | | | | GLES/gl2.h is included through Qt public headers and the copy of Chromium is used since its include path comes before /usr/include. The problem is that this header is incompatible for some reasons, one of them being that it converts all GL function symbols from gl* to GLES2*. Qt layer code should always need to go through GL directly, so make sure that only GYP targets that depend directly on gpu.gyp, khronos.gyp or webkit_gpu.gyp will have an include path pointing to those headers. Replace all_dependent_settings with direct_dependent_settings and control which target inherits this include_dirs from its dependencies by using export_dependent_settings. Change-Id: Id4d98fe22ef8b778b5ba8da300dad28e69507732 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Initial import.Zeno Albisser2013-08-15435-0/+137123
View Lorry Controller Status