[PATCH v2 1/5] winemac: Remove now unnecessary pbuffer tracking.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winemac.drv/opengl.c | 77 ++++++---------------------------------
 1 file changed, 11 insertions(+), 66 deletions(-)

diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index dd3b3e4da59..57b2ed23dd9 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -93,9 +93,6 @@ static struct gl_drawable *impl_from_opengl_drawable(struct opengl_drawable *bas
 static struct list context_list = LIST_INIT(context_list);
 static pthread_mutex_t context_mutex = PTHREAD_MUTEX_INITIALIZER;

-static CFMutableDictionaryRef dc_pbuffers;
-static pthread_mutex_t dc_pbuffers_mutex = PTHREAD_MUTEX_INITIALIZER;
-
 static void *opengl_handle;
 static const struct opengl_funcs *funcs;
 static const struct opengl_driver_funcs macdrv_driver_funcs;
@@ -2370,10 +2367,6 @@ static BOOL macdrv_pbuffer_create(HDC hdc, int format, BOOL largest, GLenum text
         return FALSE;
     }

-    pthread_mutex_lock(&dc_pbuffers_mutex);
-    CFDictionarySetValue(dc_pbuffers, hdc, gl->pbuffer);
-    pthread_mutex_unlock(&dc_pbuffers_mutex);
-
     *drawable = &gl->base;
     TRACE(" -> %p\n", gl);
     return TRUE;
@@ -2385,10 +2378,6 @@ static void macdrv_pbuffer_destroy(struct opengl_drawable *base)

TRACE("drawable %s\n", debugstr_opengl_drawable(base));

-    pthread_mutex_lock(&dc_pbuffers_mutex);
-    CFDictionaryRemoveValue(dc_pbuffers, gl->pbuffer);
-    pthread_mutex_unlock(&dc_pbuffers_mutex);
-
     CGLReleasePBuffer(gl->pbuffer);
 }

@@ -2439,22 +2428,9 @@ static BOOL macdrv_make_current(struct opengl_drawable *draw_base, struct opengl
     }
     else
     {
-        CGLPBufferObj pbuffer;
-
-        pthread_mutex_lock(&dc_pbuffers_mutex);
-        pbuffer = (CGLPBufferObj)CFDictionaryGetValue(dc_pbuffers, draw->base.hdc);
-        if (!pbuffer)
-        {
-            WARN("no window or pbuffer for DC\n");
-            pthread_mutex_unlock(&dc_pbuffers_mutex);
-            RtlSetLastWin32Error(ERROR_INVALID_HANDLE);
-            return FALSE;
-        }
-
         context->draw_hwnd = NULL;
         context->draw_view = NULL;
-        context->draw_pbuffer = pbuffer;
-        pthread_mutex_unlock(&dc_pbuffers_mutex);
+        context->draw_pbuffer = draw->pbuffer;
     }

context->read_view = NULL;
@@ -2476,9 +2452,7 @@ static BOOL macdrv_make_current(struct opengl_drawable *draw_base, struct opengl
         }
         else
         {
-            pthread_mutex_lock(&dc_pbuffers_mutex);
-            context->read_pbuffer = (CGLPBufferObj)CFDictionaryGetValue(dc_pbuffers, read->base.hdc);
-            pthread_mutex_unlock(&dc_pbuffers_mutex);
+            context->read_pbuffer = read->pbuffer;
         }
     }

@@ -2790,13 +2764,6 @@ UINT macdrv_OpenGLInit(UINT version, const struct opengl_funcs *opengl_funcs, co
     }
     funcs = opengl_funcs;

-    dc_pbuffers = CFDictionaryCreateMutable(NULL, 0, NULL, NULL);
-    if (!dc_pbuffers)
-    {
-        WARN("CFDictionaryCreateMutable failed\n");
-        return STATUS_NOT_SUPPORTED;
-    }
-
     opengl_handle = dlopen("/System/Library/Frameworks/OpenGL.framework/OpenGL", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD);
     if (!opengl_handle)
     {
@@ -2951,49 +2918,27 @@ static void *macdrv_get_proc_address(const char *name)
 static BOOL macdrv_surface_swap(struct opengl_drawable *base)
 {
     struct macdrv_context *context = NtCurrentTeb()->glReserved2;
+    struct macdrv_win_data *data;
     HWND hwnd = base->hwnd;
-    HDC hdc = base->hdc;
     BOOL match = FALSE;

-    TRACE("hdc %p context %p/%p/%p\n", hdc, context, (context ? context->context : NULL),
+    TRACE("%s context %p/%p/%p\n", debugstr_opengl_drawable(base), context, (context ? context->context : NULL),
           (context ? context->cglcontext : NULL));

-    if (hwnd)
+    if (!(data = get_win_data(hwnd)))
     {
-        struct macdrv_win_data *data;
-
-        if (!(data = get_win_data(hwnd)))
-        {
-            RtlSetLastWin32Error(ERROR_INVALID_HANDLE);
-            return FALSE;
-        }
-
-        if (context && context->draw_view == data->client_cocoa_view)
-            match = TRUE;
-
-        release_win_data(data);
+        RtlSetLastWin32Error(ERROR_INVALID_HANDLE);
+        return FALSE;
     }
-    else
-    {
-        CGLPBufferObj pbuffer;

-        pthread_mutex_lock(&dc_pbuffers_mutex);
-        pbuffer = (CGLPBufferObj)CFDictionaryGetValue(dc_pbuffers, hdc);
-        pthread_mutex_unlock(&dc_pbuffers_mutex);
+    if (context && context->draw_view == data->client_cocoa_view)
+        match = TRUE;

-        if (!pbuffer)
-        {
-            RtlSetLastWin32Error(ERROR_INVALID_HANDLE);
-            return FALSE;
-        }
-
-        if (context && context->draw_pbuffer == pbuffer)
-            match = TRUE;
-    }
+    release_win_data(data);

if (!match)
     {
-        FIXME("current context %p doesn't match hdc %p; can't swap\n", context, hdc);
+        FIXME("current context %p doesn't match; can't swap\n", context);
         return FALSE;
     }