Merge lp:~mterry/oxide/mirserver into lp:~oxide-developers/oxide/oxide.trunk
Status: | Merged |
---|---|
Approved by: | Chris Coulson |
Approved revision: | 1027 |
Merged at revision: | 1025 |
Proposed branch: | lp:~mterry/oxide/mirserver |
Merge into: | lp:~oxide-developers/oxide/oxide.trunk |
Diff against target: |
25 lines (+2/-2) 2 files modified
qt/core/browser/oxide_qt_browser_startup.cc (+1/-1) qt/core/common/oxide_qt_screen_utils.cc (+1/-1) |
To merge this branch: | bzr merge lp:~mterry/oxide/mirserver |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Coulson | Approve | ||
Review via email: mp+255128@code.launchpad.net |
Commit message
Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.
Description of the change
Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.
Inside unity8, there is this bit of code:
if (qgetenv(
setenv(
}
Now, I'm not sure *why* that's done, but it seems to be expected by qtmir, which looks for that exact string.
But when the Ubuntu Touch welcome wizard (which is running in the unity8 process) uses oxide to render some NOKIA terms and conditions, oxide doesn't recognize the platform (and crashes because we don't ship libosmesa.so).
Now maybe the fix is to change unity8 and qtmir to not drop the "ubuntu" prefix (presumably they're more interested in the client->server string change). But since Gerry, who is familiar with qtmir innards), happens to be offline right now, I'm just going to file this other fix. Which doesn't preclude changing unity8/qtmir down the line.
I have not actually tested this fix! I'm having a hard time getting the terms and conditions screen at all in the wizard right now, because I'm missing the HERE bits on my phone.
I think this looks ok. What version of Oxide crashes when the platform isn't recognized? That should be fixed by http:// bazaar. launchpad. net/~oxide- developers/ oxide/oxide. trunk/revision/ 944 (the expected behaviour is that it disables GPU access entirely and falls back to software compositing)