diff options
Diffstat (limited to 'src/VBox/Main/src-client/DisplayImpl.cpp')
| -rw-r--r-- | src/VBox/Main/src-client/DisplayImpl.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/VBox/Main/src-client/DisplayImpl.cpp b/src/VBox/Main/src-client/DisplayImpl.cpp index dd3a278bd..658fa3963 100644 --- a/src/VBox/Main/src-client/DisplayImpl.cpp +++ b/src/VBox/Main/src-client/DisplayImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: DisplayImpl.cpp 38275 2011-08-02 11:14:44Z vboxsync $ */ +/* $Id: DisplayImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ @@ -2192,7 +2192,8 @@ int Display::displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_ { int rc; pDisplay->vbvaLock(); - if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN) + if ( aScreenId == VBOX_VIDEO_PRIMARY_SCREEN + && pDisplay->maFramebuffers[aScreenId].fVBVAEnabled == false) /* A non-VBVA mode. */ { rc = pDisplay->mpDrv->pUpPort->pfnTakeScreenshot(pDisplay->mpDrv->pUpPort, ppu8Data, pcbData, pu32Width, pu32Height); } @@ -2991,6 +2992,19 @@ DECLCALLBACK(int) Display::changeFramebuffer (Display *that, IFramebuffer *aFB, /* Setup the new framebuffer, the resize will lead to an updateDisplayData call. */ DISPLAYFBINFO *pFBInfo = &that->maFramebuffers[uScreenId]; +#if defined(VBOX_WITH_CROGL) + /* Leave the lock, because SHCRGL_HOST_FN_SCREEN_CHANGED will read current framebuffer */ + { + BOOL is3denabled; + that->mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled); + + if (is3denabled) + { + alock.leave (); + } + } +#endif + if (pFBInfo->fVBVAEnabled && pFBInfo->pu8FramebufferVRAM) { /* This display in VBVA mode. Resize it to the last guest resolution, |