Merge lp://staging/~gerboland/qtmir/no-crash-multimonitor into lp://staging/qtmir
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~gerboland/qtmir/no-crash-multimonitor |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
1585 lines (+721/-260) 22 files modified
src/platforms/mirserver/CMakeLists.txt (+3/-2) src/platforms/mirserver/display.cpp (+0/-51) src/platforms/mirserver/display.h (+0/-41) src/platforms/mirserver/logging.h (+1/-0) src/platforms/mirserver/miropenglcontext.cpp (+31/-16) src/platforms/mirserver/miropenglcontext.h (+5/-0) src/platforms/mirserver/mirserver.cpp (+7/-1) src/platforms/mirserver/mirserver.h (+1/-0) src/platforms/mirserver/mirserverintegration.cpp (+36/-30) src/platforms/mirserver/mirserverintegration.h (+6/-10) src/platforms/mirserver/offscreensurface.cpp (+63/-0) src/platforms/mirserver/offscreensurface.h (+43/-0) src/platforms/mirserver/qmirserver.cpp (+31/-10) src/platforms/mirserver/qmirserver.h (+16/-4) src/platforms/mirserver/qtcompositor.cpp (+14/-35) src/platforms/mirserver/qtcompositor.h (+15/-6) src/platforms/mirserver/screen.cpp (+65/-5) src/platforms/mirserver/screen.h (+26/-2) src/platforms/mirserver/screencontroller.cpp (+225/-0) src/platforms/mirserver/screencontroller.h (+72/-0) src/platforms/mirserver/screenwindow.cpp (+52/-36) src/platforms/mirserver/screenwindow.h (+9/-11) |
| To merge this branch: | bzr merge lp://staging/~gerboland/qtmir/no-crash-multimonitor |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
Inital multimonitor support - react correctly to Mir DisplayConfigur
On Mir DisplayConfigur
1. blocks Mir until it has stopped all renderers and has their GL context released
2. reads the new DisplayConfigur
3. restarts all renderers
Not yet exporting Display configuration to a shell, nor are we specifying any custom DisplayConfigur
Unmerged revisions
- 320. By Gerry Boland
-
Inital multimonitor support - react correctly to Mir DisplayConfigur
ation changes On Mir DisplayConfigur
ation changes, QtMir now correctly:
1. blocks Mir until it has stopped all renderers and has their GL context released
2. reads the new DisplayConfiguration, matches any existing ScreenWindows to new DisplayBuffer should they change (Mir may destroy and create it on us)
3. restarts all renderersNot yet exporting Display configuration to a shell, nor are we specifying any custom DisplayConfigur
ation policy. This is mainly to have shell stop crashing!
