diff options
| author | Eleni Maria Stea <elenimaria.stea@canonical.com> | 2013-11-07 13:45:40 +0200 |
|---|---|---|
| committer | Eleni Maria Stea <elenimaria.stea@canonical.com> | 2013-11-07 13:45:40 +0200 |
| commit | ce8729e97b405293f58405691466db4693e70244 (patch) | |
| tree | 6191d3ef9c7fb5c94d194ce2e71ec61e56973fa5 /plugins/unityshell | |
| parent | 5efbfc34ba7ce7237b47daa3e27c01e512dbdc5a (diff) | |
fixed unity compile errors:
1. SetReferenceFramebuffer function gets 3 parameters (Nux/WindowCompositor.h) 2. RenderInterfaceFromForeignCmd gets const reference not pointer as argument (Nux/WindowThread.h) (bzr r3589.1.1)
Diffstat (limited to 'plugins/unityshell')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index f2db18a2a..2bd808162 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -725,10 +725,10 @@ void UnityScreen::paintDisplay() GLint fboID; // Nux renders to the referenceFramebuffer when it's embedded. glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fboID); - wt->GetWindowCompositor().SetReferenceFramebuffer(fboID, outputGeo); + wt->GetWindowCompositor().SetReferenceFramebuffer(fboID, fboID, outputGeo); nuxPrologue(); - wt->RenderInterfaceFromForeignCmd (&outputGeo); + wt->RenderInterfaceFromForeignCmd (outputGeo); nuxEpilogue(); for (Window tray_xid : panel_controller_->GetTrayXids()) |
