Roderick Colenbrander : wined3d: Prevent a recursive ENTER_GL before calling blitter->free_private.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d4b4810ebeb59c605307a5b273d5b3b957617c6c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d4b4810ebeb59c605307a5b273...

Author: Roderick Colenbrander <thunderbird2k(a)gmx.net>
Date:   Sat Oct 18 23:21:06 2008 +0000

wined3d: Prevent a recursive ENTER_GL before calling blitter->free_private.

---

 dlls/wined3d/device.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 48ddbd8..185dbef 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -7015,10 +7015,13 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_
         This->depth_blt_rb_w = 0;
         This->depth_blt_rb_h = 0;
     }
+    LEAVE_GL();
+
     This->blitter->free_private(iface);
     This->frag_pipe->free_private(iface);
     This->shader_backend->shader_free_private(iface);
 
+    ENTER_GL();
     for (i = 0; i < GL_LIMITS(textures); i++) {
         /* Textures are recreated below */
         glDeleteTextures(1, &This->dummyTextureName[i]);