• Miklos Vajna's avatar
    windows opengl: make sure mpLastContext is indeed the current context · 52356d43
    Miklos Vajna yazdı
    There were two problems here:
    
    1) The OpenGLContext ctor registered the instance on the list of
    contexts, but platform-specific call (e.g. wglMakeCurrent()) was only
    made later. Add a registerAsCurrent() member function that helps
    ensuring that the last item in the context list is indeed the current
    context.
    
    2) OpenGLContext::prepareForYield() is called without the solar mutex
    being locked, but it still assumes that the last context in the context
    list is the thread's current context, which may not be true.  The result
    is that during JunitTest_sd_unoapi, we end up in a situation like:
    
    debug:4640:5240: OpenGLContext::registerAsCurrent: wglGetCurrentContext() is 00010001, pSVData->maGDIData.mpLastContext is 00FA65F8
    debug:4640:7944: OpenGLContext::registerAsCurrent: wglGetCurrentContext() is 000D0003, pSVData->maGDIData.mpLastContext is 00FA6C70
    debug:4640:5240: OpenGLContext::prepareForYield: start, wglGetCurrentContext() is 00010001, pSVData->maGDIData.mpLastContext is 00FA6C70
    
    I.e. one thread registers as current, an other registers as current, too (while
    the other thread has the solar mutex), then once the original thread wants to
    release the solar mutex, the real current context and the last item in the
    context list won't match, so the assert at the end of prepareForYield() will
    fail.
    
    Fix this by releasing the GL context in WinSalInstance::DestroyFrame().
    
    With this, JunitTest_sd_unoapi passes on Windows with GL enabled.
    
    Change-Id: Icfb9c65c871586b5df69b5a2ab3aa91843dfc799
    Reviewed-on: https://gerrit.libreoffice.org/18473Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
    Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
    Signed-off-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/18488
    52356d43
Adı
Son kayıt (commit)
Son güncelleme
..
app Loading commit data...
gdi Loading commit data...
src Loading commit data...
window Loading commit data...