Roderick Colenbrander : wined3d: Fix a recursive ENTER_GL in read_from_framebuffer.

[Alexandre Julliard]

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

Author: Roderick Colenbrander <thunderbird2k at gmx.net>
Date:   Sat Oct 18 23:21:46 2008 +0000

wined3d: Fix a recursive ENTER_GL in read_from_framebuffer.

---

 dlls/wined3d/surface.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 2d6a097..a91da6c 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -916,9 +916,10 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This)
      */
     ActivateContext(device, (IWineD3DSurface *) This, CTXUSAGE_RESOURCELOAD);
     surface_bind_and_dirtify(This);
-    ENTER_GL();
 
+    ENTER_GL();
     glGetIntegerv(GL_READ_BUFFER, &prevRead);
+    LEAVE_GL();
 
     /* Select the correct read buffer, and give some debug output.
      * There is no need to keep track of the current read buffer or reset it, every part of the code
@@ -928,8 +929,11 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This)
     {
         GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain);
         TRACE("Locking %#x buffer\n", buffer);
+
+        ENTER_GL();
         glReadBuffer(buffer);
         checkGLcall("glReadBuffer");
+        LEAVE_GL();
 
         IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain);
     } else {
@@ -937,7 +941,9 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This)
          * Read from the back buffer
          */
         TRACE("Locking offscreen render target\n");
+        ENTER_GL();
         glReadBuffer(device->offscreenBuffer);
+        LEAVE_GL();
     }
 
     if(!(This->Flags & SFLAG_ALLOCATED)) {
@@ -947,6 +953,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This)
 
     clear_unused_channels(This);
 
+    ENTER_GL();
     /* If !SrcIsUpsideDown we should flip the surface.
      * This can be done using glCopyTexSubImage2D but this
      * is VERY slow, so don't do that. We should prevent