diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-04-02 02:27:31 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-09 18:13:50 +0200 |
| commit | 8e1a9c88431bbae3a47d09799395d81f76626ec0 (patch) | |
| tree | d09be6d92354ac9afdc46d809f17fe617f9a66c4 /src/core/config | |
| parent | 6de87734c623d0b6ecfea0440ee396a00d59d74f (diff) | |
Add GLContextHelper class for EGL context creation.
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>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/embedded_linux.gypi | 9 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/core/config/embedded_linux.gypi b/src/core/config/embedded_linux.gypi new file mode 100644 index 000000000..f192243ce --- /dev/null +++ b/src/core/config/embedded_linux.gypi @@ -0,0 +1,9 @@ +{ + 'target_defaults': { + # patterns used to exclude chromium files from the build when we have a drop-in replacement + 'sources/': [ + # We are using gl_context_qt.cc instead. + ['exclude', 'gl_context_ozone.cc$'], + ], + }, +} diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index d90072ef3..8aaff3e93 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -1,4 +1,4 @@ -GYP_ARGS += "-D qt_os=\"embedded_linux\"" +GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi" GYP_CONFIG += \ embedded=1 \ |