QtMir

Merge lp://staging/~nick-dedekind/qtmir/multiwindow.textures into lp://staging/qtmir

multiwindow.textures
Merge into trunk

Proposed by Nick Dedekind on 2017-02-07

Status:	Superseded
Proposed branch:	lp://staging/~nick-dedekind/qtmir/multiwindow.textures
Merge into:	lp://staging/qtmir
Diff against target:	4702 lines (+2822/-724) 63 files modified CMakeLists.txt (+2/-0) demos/CMakeLists.txt (+2/-1) demos/api-demo-shell/CMakeLists.txt (+41/-0) demos/api-demo-shell/main.cpp (+133/-0) include/qtmir/displayconfigurationpolicy.h (+74/-10) include/qtmir/displayconfigurationstorage.h (+45/-0) include/qtmir/guiserverapplication.h (+55/-0) include/qtmir/miral/display_configuration_policy.h (+42/-0) include/qtmir/miral/display_configuration_storage.h (+52/-0) include/qtmir/miral/edid.h (+68/-0) include/qtmir/sessionauthorizer.h (+63/-20) include/qtmir/windowmanagementpolicy.h (+139/-0) src/modules/Unity/Application/CMakeLists.txt (+4/-3) src/modules/Unity/Application/application_manager.cpp (+2/-2) src/modules/Unity/Application/compositortextureprovider.cpp (+50/-0) src/modules/Unity/Application/compositortextureprovider.h (+62/-0) src/modules/Unity/Application/mirsurface.cpp (+102/-103) src/modules/Unity/Application/mirsurface.h (+12/-10) src/modules/Unity/Application/mirsurfaceinterface.h (+5/-5) src/modules/Unity/Application/mirsurfaceitem.cpp (+37/-22) src/modules/Unity/Application/mirsurfaceitem.h (+2/-2) src/modules/Unity/Application/sessionmanager.cpp (+1/-1) src/modules/Unity/Application/surfacemanager.h (+2/-2) src/modules/Unity/Application/windowmodel.h (+1/-1) src/modules/Unity/Screens/CMakeLists.txt (+1/-1) src/platforms/mirserver/CMakeLists.txt (+107/-46) src/platforms/mirserver/displayconfigurationpolicy.cpp (+54/-44) src/platforms/mirserver/displayconfigurationstorage.cpp (+46/-0) src/platforms/mirserver/guiserverapplication.cpp (+63/-0) src/platforms/mirserver/miral/CMakeLists.txt (+12/-0) src/platforms/mirserver/miral/display_configuration_policy.cpp (+21/-0) src/platforms/mirserver/miral/edid.cpp (+112/-0) src/platforms/mirserver/miral/persist_display_config.cpp (+237/-0) src/platforms/mirserver/miral/persist_display_config.h (+56/-0) src/platforms/mirserver/mirserverintegration.cpp (+1/-1) src/platforms/mirserver/mirserverintegration.h (+2/-1) src/platforms/mirserver/qmirserver.cpp (+51/-0) src/platforms/mirserver/qmirserver.h (+25/-3) src/platforms/mirserver/qmirserver_p.cpp (+77/-11) src/platforms/mirserver/qmirserver_p.h (+14/-8) src/platforms/mirserver/qtmirserver.pc.in (+9/-0) src/platforms/mirserver/screensmodel.cpp (+1/-2) src/platforms/mirserver/windowcontroller.cpp (+1/-1) src/platforms/mirserver/windowcontroller.h (+3/-3) src/platforms/mirserver/wrappedsessionauthorizer.cpp (+134/-72) src/platforms/mirserver/wrappedsessionauthorizer.h (+39/-0) src/platforms/mirserver/wrappedwindowmanagementpolicy.cpp (+501/-292) src/platforms/mirserver/wrappedwindowmanagementpolicy.h (+28/-35) tests/framework/CMakeLists.txt (+1/-0) tests/framework/fake_displayconfigurationoutput.h (+2/-0) tests/framework/fake_mirsurface.cpp (+9/-9) tests/framework/fake_mirsurface.h (+5/-5) tests/mirserver/CMakeLists.txt (+1/-0) tests/mirserver/EventBuilder/CMakeLists.txt (+1/-1) tests/mirserver/QtEventFeeder/CMakeLists.txt (+1/-1) tests/mirserver/Screen/CMakeLists.txt (+3/-1) tests/mirserver/ScreensModel/CMakeLists.txt (+1/-1) tests/mirserver/miral/CMakeLists.txt (+18/-0) tests/mirserver/miral/edid_test.cpp (+168/-0) tests/modules/Application/CMakeLists.txt (+1/-1) tests/modules/WindowManager/CMakeLists.txt (+1/-0) tests/modules/WindowManager/mirsurface_test.cpp (+18/-2) tests/modules/WindowManager/windowmodel_test.cpp (+1/-1)
To merge this branch:	bzr merge lp://staging/~nick-dedekind/qtmir/multiwindow.textures
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir development team		2017-02-07	Pending
Review via email: mp+316546@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2017-02-09.

Commit message

Multiple compositor support for surface textures.

lp://staging/~nick-dedekind/qtmir/multiwindow.textures updated on 2017-02-07

592. By Nick Dedekind on 2017-02-07: merged with trunk

Revision history for this message

Gerry Boland (gerboland) wrote on 2017-02-08:

+ int curentFrame()
MirSurface::setTexturePorvider
typos

+ int m_currentFrameNumber;
unsigned would help, would give 136 years at 60fps instead of 68 :)

Overall, this looks ok. I'm curious about one thing. We're using Mir's user_id thing, passing it to generate_renderables for each display. I am curious if that returns a single texture to be shared between each display - or a distinct texture per display. If the later, I would wonder why, and we (later) might try eradicating the copy and just share one, to save GPU memory.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-08:

Worth checking how this affects the new frame dropping implementation in MirSurface

lp://staging/~nick-dedekind/qtmir/multiwindow.textures updated on 2017-04-06