Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • Krita Krita
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Bugzilla
    • Bugzilla
  • Merge requests 77
    • Merge requests 77
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • GraphicsGraphics
  • KritaKrita
  • Merge requests
  • !1373

Build a more recent version of ANGLE and make Qt use it

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Alvin Wong requested to merge alvinwong/krita:alvin/ext_angle into master Mar 12, 2022
  • Overview 14
  • Commits 2
  • Pipelines 36
  • Changes 25

This MR adds a custom ANGLE build ext_googleangle to 3rdparty and makes Qt build against it instead of it's bundled ANGLE. The HDR support patch by @dkazakov has also been rebased.

The custom ANGLE build uses a CMakeLists.txt taken from vcpkg and adapted to this version of ANGLE.

The ANGLE version used is the one that goes with Chromium release 100 (currently in Beta channel). See 3rdparty/ext_googleangle/CMakeLists.txt for more details on the selected ANGLE revision.

The current ANGLE patches correspond to this branch: https://github.com/alvinhochun/angle/tree/for-krita

This MR depends on !1372 (merged), because building this ANGLE needs (1) updated mingw-w64 headers and (2) Clang. In theory the mingw-builds GCC 11.2 toolchain can work, but I found that GCC generates broken code with latest ANGLE. (It can be worked around in code but I haven't looked into that yet.)

Edited May 12, 2022 by Alvin Wong
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: alvin/ext_angle