Merge lp://qastaging/~gerboland/qtmir/fix-glcontext-loss-on-reconfigure into lp://qastaging/qtmir
Proposed by
Gerry Boland
| Status: | Merged |
|---|---|
| Approved by: | Daniel d'Andrada |
| Approved revision: | 587 |
| Merged at revision: | 600 |
| Proposed branch: | lp://qastaging/~gerboland/qtmir/fix-glcontext-loss-on-reconfigure |
| Merge into: | lp://qastaging/qtmir |
| Diff against target: |
92 lines (+31/-10) 3 files modified
src/platforms/mirserver/screensmodel.cpp (+29/-8) src/platforms/mirserver/screensmodel.h (+2/-1) src/platforms/mirserver/screenwindow.cpp (+0/-1) |
| To merge this branch: | bzr merge lp://qastaging/~gerboland/qtmir/fix-glcontext-loss-on-reconfigure |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel d'Andrada (community) | Approve | ||
| Unity8 CI Bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
ScreenModel: Only expose windows on displays that are turned on
It seems the GL context Mir gives us for a display that is turned off is invalid. But there is no point rendering to a display that is turned off anyway.
To post a comment you must log in.
Revision history for this message
| Gerry Boland (gerboland) wrote | # |
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Daniel d'Andrada (dandrader) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Handy test, grab
https:/
Run it with
./display-
and hit the letter "O" - big o. (I find you need to click on the surface for it to get input correctly)
The display should turn off.
P isn't turning it on yet - need to figure out why, if input is disabled or if QtMir isn't passing input to non-exposed windows or something.
To turn display on, kill the display-