From abe37bbb0ebda9e755ba1b27f836a4b9ba93e30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Sun, 20 Dec 2009 13:12:17 +0100 Subject: [PATCH 02/13] WineD3D: Call the non-wrapped GLfinish in the PBO test Calling the winex11.drv wrapped glFinish can cause deadlocks. Since we don't need any on-screen drawable updated, the unwrapped call is good enough. I don't want to remove the call entirely because some OSX versions that suffer from the PBO bug have glTexImage* synchronisation issues. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0854693..3fce595 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -529,7 +529,7 @@ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) checkGLcall("Loading the PBO test texture"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - wglFinish(); /* just to be sure */ + wine_glFinish(); /* just to be sure */ memset(check, 0, sizeof(check)); glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, check); -- 1.6.4.4