Module: wine Branch: master Commit: 33e6932c045f1e73709f483ccd4c9d897b2eedd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e6932c045f1e73709f483cc...
Author: Jacek Caban jacek@codeweavers.com Date: Tue May 17 01:25:22 2022 +0200
winemac: Use pthread for synchronization in opengl.c.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winemac.drv/opengl.c | 84 +++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 53 deletions(-)
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index d61d0a6ea66..f553b93da5a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -77,15 +77,7 @@ struct wgl_context };
static struct list context_list = LIST_INIT(context_list); - -static CRITICAL_SECTION context_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &context_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": context_section") } -}; -static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t context_mutex = PTHREAD_MUTEX_INITIALIZER;
struct wgl_pbuffer @@ -99,15 +91,7 @@ struct wgl_pbuffer };
static CFMutableDictionaryRef dc_pbuffers; - -static CRITICAL_SECTION dc_pbuffers_section; -static CRITICAL_SECTION_DEBUG dc_pbuffers_section_debug = -{ - 0, 0, &dc_pbuffers_section, - { &dc_pbuffers_section_debug.ProcessLocksList, &dc_pbuffers_section_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dc_pbuffers_section") } -}; -static CRITICAL_SECTION dc_pbuffers_section = { &dc_pbuffers_section_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t dc_pbuffers_mutex = PTHREAD_MUTEX_INITIALIZER;
static struct opengl_funcs opengl_funcs; @@ -1363,7 +1347,7 @@ static int get_dc_pixel_format(HDC hdc) { struct wgl_pbuffer *pbuffer;
- EnterCriticalSection(&dc_pbuffers_section); + pthread_mutex_lock(&dc_pbuffers_mutex); pbuffer = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, hdc); if (pbuffer) format = pbuffer->format; @@ -1372,7 +1356,7 @@ static int get_dc_pixel_format(HDC hdc) WARN("no window or pbuffer for DC %p\n", hdc); format = 0; } - LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex); }
return format; @@ -1612,13 +1596,13 @@ static void mark_contexts_for_moved_view(macdrv_view view) { struct wgl_context *context;
- EnterCriticalSection(&context_section); + pthread_mutex_lock(&context_mutex); LIST_FOR_EACH_ENTRY(context, &context_list, struct wgl_context, entry) { if (context->draw_view == view) InterlockedExchange(&context->view_moved, TRUE); } - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&context_mutex); }
@@ -2885,9 +2869,9 @@ static struct wgl_context *macdrv_wglCreateContextAttribsARB(HDC hdc, return NULL; }
- EnterCriticalSection(&context_section); + pthread_mutex_lock(&context_mutex); list_add_tail(&context_list, &context->entry); - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&context_mutex);
return context; } @@ -3090,7 +3074,7 @@ static HDC macdrv_wglGetPbufferDCARB(struct wgl_pbuffer *pbuffer) hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); if (!hdc) return 0;
- EnterCriticalSection(&dc_pbuffers_section); + pthread_mutex_lock(&dc_pbuffers_mutex); prev = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, hdc); if (prev) { @@ -3098,7 +3082,7 @@ static HDC macdrv_wglGetPbufferDCARB(struct wgl_pbuffer *pbuffer) HeapFree(GetProcessHeap(), 0, prev); } CFDictionarySetValue(dc_pbuffers, hdc, pbuffer); - LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex);
TRACE("pbuffer %p -> hdc %p\n", pbuffer, hdc); return hdc; @@ -3538,14 +3522,14 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w { struct wgl_pbuffer *pbuffer;
- EnterCriticalSection(&dc_pbuffers_section); + pthread_mutex_lock(&dc_pbuffers_mutex); pbuffer = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, draw_hdc); if (pbuffer) { if (context->format != pbuffer->format) { WARN("mismatched pixel format draw_hdc %p %u context %p %u\n", draw_hdc, pbuffer->format, context, context->format); - LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return FALSE; } @@ -3556,7 +3540,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w else { WARN("no window or pbuffer for DC\n"); - LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex); SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -3564,7 +3548,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w context->draw_hwnd = NULL; context->draw_view = NULL; context->draw_pbuffer = pbuffer; - LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex); }
context->read_view = NULL; @@ -3586,9 +3570,9 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w } else { - EnterCriticalSection(&dc_pbuffers_section); + pthread_mutex_lock(&dc_pbuffers_mutex); context->read_pbuffer = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, read_hdc); - LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex); } }
@@ -3933,7 +3917,7 @@ static int macdrv_wglReleasePbufferDCARB(struct wgl_pbuffer *pbuffer, HDC hdc)
TRACE("pbuffer %p hdc %p\n", pbuffer, hdc);
- EnterCriticalSection(&dc_pbuffers_section); + pthread_mutex_lock(&dc_pbuffers_mutex);
prev = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, hdc); if (prev) @@ -3946,7 +3930,7 @@ static int macdrv_wglReleasePbufferDCARB(struct wgl_pbuffer *pbuffer, HDC hdc) } else hdc = 0;
- LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex);
return hdc && DeleteDC(hdc); } @@ -4109,13 +4093,13 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) { struct wgl_context *ctx;
- EnterCriticalSection(&context_section); + pthread_mutex_lock(&context_mutex); LIST_FOR_EACH_ENTRY(ctx, &context_list, struct wgl_context, entry) { if (ctx != context && ctx->draw_hwnd == context->draw_hwnd) InterlockedExchange(&context->update_swap_interval, TRUE); } - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&context_mutex); }
return TRUE; @@ -4222,21 +4206,17 @@ static void load_extensions(void) }
-static BOOL CALLBACK init_opengl(INIT_ONCE *init_once, void *context, void **param) +static void init_opengl(void) { - static BOOL init_done = FALSE; unsigned int i;
- if (init_done) return (opengl_handle != NULL); - init_done = TRUE; - TRACE("()\n");
dc_pbuffers = CFDictionaryCreateMutable(NULL, 0, NULL, NULL); if (!dc_pbuffers) { WARN("CFDictionaryCreateMutable failed\n"); - return FALSE; + return; }
opengl_handle = dlopen("/System/Library/Frameworks/OpenGL.framework/OpenGL", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD); @@ -4244,7 +4224,7 @@ static BOOL CALLBACK init_opengl(INIT_ONCE *init_once, void *context, void **par { ERR("Failed to load OpenGL: %s\n", dlerror()); ERR("OpenGL support is disabled.\n"); - return FALSE; + return; }
for (i = 0; i < ARRAY_SIZE(opengl_func_names); i++) @@ -4285,12 +4265,11 @@ static BOOL CALLBACK init_opengl(INIT_ONCE *init_once, void *context, void **par if (!init_pixel_formats()) goto failed;
- return TRUE; + return;
failed: dlclose(opengl_handle); opengl_handle = NULL; - return FALSE; }
@@ -4419,9 +4398,9 @@ static BOOL WINAPI macdrv_wglDeleteContext(struct wgl_context *context) { TRACE("deleting context %p/%p/%p\n", context, context->context, context->cglcontext);
- EnterCriticalSection(&context_section); + pthread_mutex_lock(&context_mutex); list_remove(&context->entry); - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&context_mutex);
macdrv_dispose_opengl_context(context->context); return HeapFree(GetProcessHeap(), 0, context); @@ -4583,9 +4562,9 @@ static BOOL WINAPI macdrv_wglSwapBuffers(HDC hdc) { struct wgl_pbuffer *pbuffer;
- EnterCriticalSection(&dc_pbuffers_section); + pthread_mutex_lock(&dc_pbuffers_mutex); pbuffer = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, hdc); - LeaveCriticalSection(&dc_pbuffers_section); + pthread_mutex_unlock(&dc_pbuffers_mutex);
if (!pbuffer) { @@ -4634,7 +4613,7 @@ static struct opengl_funcs opengl_funcs = */ struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) { - static INIT_ONCE opengl_init = INIT_ONCE_STATIC_INIT; + static pthread_once_t init_once = PTHREAD_ONCE_INIT;
if (version != WINE_WGL_DRIVER_VERSION) { @@ -4642,7 +4621,6 @@ struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) return NULL; }
- if (!InitOnceExecuteOnce(&opengl_init, init_opengl, NULL, NULL)) return (void *)-1; - - return &opengl_funcs; + pthread_once(&init_once, init_opengl); + return opengl_handle ? &opengl_funcs : (void *)-1; }