From: Rémi Bernon rbernon@codeweavers.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58001 --- dlls/win32u/opengl.c | 34 ++-------------------------------- dlls/wineandroid.drv/opengl.c | 10 ---------- dlls/winemac.drv/opengl.c | 14 -------------- dlls/winewayland.drv/opengl.c | 7 ------- dlls/winex11.drv/opengl.c | 27 --------------------------- include/wine/opengl_driver.h | 1 - 6 files changed, 2 insertions(+), 91 deletions(-)
diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index e29fe97f4a7..6cb7f5124bd 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -424,12 +424,6 @@ static BOOL egldrv_context_destroy( void *private ) return FALSE; }
-static BOOL egldrv_context_copy( void *src_private, void *dst_private, UINT mask ) -{ - FIXME( "stub!\n" ); - return FALSE; -} - static BOOL egldrv_context_share( void *src_private, void *dst_private ) { FIXME( "stub!\n" ); @@ -462,7 +456,6 @@ static const struct opengl_driver_funcs egldrv_funcs = .p_pbuffer_bind = egldrv_pbuffer_bind, .p_context_create = egldrv_context_create, .p_context_destroy = egldrv_context_destroy, - .p_context_copy = egldrv_context_copy, .p_context_share = egldrv_context_share, .p_context_flush = egldrv_context_flush, .p_context_make_current = egldrv_context_make_current, @@ -732,12 +725,6 @@ static BOOL osmesa_swap_buffers( void *private, HWND hwnd, HDC hdc, int interval return TRUE; }
-static BOOL osmesa_context_copy( void *src_private, void *dst_private, UINT mask ) -{ - FIXME( "not supported yet\n" ); - return FALSE; -} - static BOOL osmesa_context_share( void *src_private, void *dst_private ) { FIXME( "not supported yet\n" ); @@ -808,7 +795,6 @@ static const struct opengl_driver_funcs osmesa_driver_funcs = .p_swap_buffers = osmesa_swap_buffers, .p_context_create = osmesa_context_create, .p_context_destroy = osmesa_context_destroy, - .p_context_copy = osmesa_context_copy, .p_context_share = osmesa_context_share, .p_context_flush = osmesa_context_flush, .p_context_make_current = osmesa_context_make_current, @@ -887,11 +873,6 @@ static BOOL nulldrv_context_destroy( void *private ) return FALSE; }
-static BOOL nulldrv_context_copy( void *src_private, void *dst_private, UINT mask ) -{ - return FALSE; -} - static BOOL nulldrv_context_share( void *src_private, void *dst_private ) { return FALSE; @@ -921,7 +902,6 @@ static const struct opengl_driver_funcs nulldrv_funcs = .p_pbuffer_bind = nulldrv_pbuffer_bind, .p_context_create = nulldrv_context_create, .p_context_destroy = nulldrv_context_destroy, - .p_context_copy = nulldrv_context_copy, .p_context_share = nulldrv_context_share, .p_context_flush = nulldrv_context_flush, .p_context_make_current = nulldrv_context_make_current, @@ -1126,16 +1106,6 @@ static BOOL win32u_wglDeleteContext( struct wgl_context *context ) return ret; }
-static BOOL win32u_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask ) -{ - const struct opengl_driver_funcs *funcs = src->driver_funcs; - - TRACE( "src %p, dst %p, mask %#x\n", src, dst, mask ); - - if (funcs != dst->driver_funcs) return FALSE; - return funcs->p_context_copy( src->driver_private, dst->driver_private, mask ); -} - static BOOL win32u_wglShareLists( struct wgl_context *src, struct wgl_context *dst ) { const struct opengl_driver_funcs *funcs = src->driver_funcs; @@ -1744,7 +1714,7 @@ static void memory_funcs_init(void)
memory_funcs.p_wglCreateContext = win32u_wglCreateContext; memory_funcs.p_wglDeleteContext = win32u_wglDeleteContext; - memory_funcs.p_wglCopyContext = win32u_wglCopyContext; + memory_funcs.p_wglCopyContext = (void *)1; /* never called */ memory_funcs.p_wglShareLists = win32u_wglShareLists; memory_funcs.p_wglMakeCurrent = win32u_wglMakeCurrent;
@@ -1777,7 +1747,7 @@ static void display_funcs_init(void)
display_funcs.p_wglCreateContext = win32u_wglCreateContext; display_funcs.p_wglDeleteContext = win32u_wglDeleteContext; - display_funcs.p_wglCopyContext = win32u_wglCopyContext; + display_funcs.p_wglCopyContext = (void *)1; /* never called */ display_funcs.p_wglShareLists = win32u_wglShareLists; display_funcs.p_wglMakeCurrent = win32u_wglMakeCurrent;
diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 79204b5e277..cce27239f15 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -298,15 +298,6 @@ done: return ret; }
-/*********************************************************************** - * android_wglCopyContext - */ -static BOOL android_context_copy( void *src, void *dst, UINT mask ) -{ - FIXME( "%p -> %p mask %#x unsupported\n", src, dst, mask ); - return FALSE; -} - /*********************************************************************** * android_wglDeleteContext */ @@ -400,7 +391,6 @@ static struct opengl_driver_funcs android_driver_funcs = .p_swap_buffers = android_swap_buffers, .p_context_create = android_context_create, .p_context_destroy = android_context_destroy, - .p_context_copy = android_context_copy, .p_context_share = android_context_share, .p_context_flush = android_context_flush, .p_context_make_current = android_context_make_current, diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 6eb9120fb59..9916a1a7aa4 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2945,19 +2945,6 @@ static BOOL macdrv_describe_pixel_format(int format, struct wgl_pixel_format *de return TRUE; }
-static BOOL macdrv_context_copy(void *src_private, void *dst_private, UINT mask) -{ - struct macdrv_context *src = src_private, *dst = dst_private; - CGLError err; - - TRACE("src %p dst %p mask %x\n", src, dst, mask); - - err = CGLCopyContext(src->cglcontext, dst->cglcontext, mask); - if (err != kCGLNoError) - WARN("CGLCopyContext() failed with err %d %s\n", err, CGLErrorString(err)); - return (err == kCGLNoError); -} - static BOOL macdrv_context_destroy(void *private) { struct macdrv_context *context = private; @@ -3104,7 +3091,6 @@ static const struct opengl_driver_funcs macdrv_driver_funcs = .p_swap_buffers = macdrv_swap_buffers, .p_context_create = macdrv_context_create, .p_context_destroy = macdrv_context_destroy, - .p_context_copy = macdrv_context_copy, .p_context_share = macdrv_context_share, .p_context_flush = macdrv_context_flush, .p_context_make_current = macdrv_context_make_current, diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index dfda1972dcf..619eed19903 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -471,12 +471,6 @@ void wayland_glClear(GLbitfield mask) p_glClear(mask); }
-static BOOL wayland_context_copy(void *src, void *dst, UINT mask) -{ - FIXME("%p -> %p mask %#x unsupported\n", src, dst, mask); - return FALSE; -} - static BOOL wayland_context_destroy(void *private) { struct wayland_context *ctx = private; @@ -641,7 +635,6 @@ static struct opengl_driver_funcs wayland_driver_funcs = .p_swap_buffers = wayland_swap_buffers, .p_context_create = wayland_context_create, .p_context_destroy = wayland_context_destroy, - .p_context_copy = wayland_context_copy, .p_context_share = wayland_context_share, .p_context_flush = wayland_context_flush, .p_context_make_current = wayland_context_make_current, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6e1b914b55f..a95a058c41e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1494,32 +1494,6 @@ static BOOL x11drv_describe_pixel_format( int iPixelFormat, struct wgl_pixel_for return TRUE; }
-/*********************************************************************** - * glxdrv_wglCopyContext - */ -static BOOL x11drv_context_copy(void *src_private, void *dst_private, UINT mask) -{ - struct x11drv_context *src = src_private, *dst = dst_private; - TRACE("%p -> %p mask %#x\n", src, dst, mask); - - X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); - pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); - XSync( gdi_display, False ); - if (X11DRV_check_error()) - { - static unsigned int once; - - if (!once++) - { - ERR("glXCopyContext failed. glXCopyContext() for direct rendering contexts not " - "implemented in the host graphics driver?\n"); - } - return FALSE; - } - - return TRUE; -} - /*********************************************************************** * glxdrv_wglDeleteContext */ @@ -2081,7 +2055,6 @@ static const struct opengl_driver_funcs x11drv_driver_funcs = .p_swap_buffers = x11drv_swap_buffers, .p_context_create = x11drv_context_create, .p_context_destroy = x11drv_context_destroy, - .p_context_copy = x11drv_context_copy, .p_context_share = x11drv_context_share, .p_context_flush = x11drv_context_flush, .p_context_make_current = x11drv_context_make_current, diff --git a/include/wine/opengl_driver.h b/include/wine/opengl_driver.h index 2de585d8ce5..ca53c6037c7 100644 --- a/include/wine/opengl_driver.h +++ b/include/wine/opengl_driver.h @@ -134,7 +134,6 @@ struct opengl_driver_funcs BOOL (*p_swap_buffers)(void*,HWND,HDC,int); BOOL (*p_context_create)(HDC,int,void*,const int*,void**); BOOL (*p_context_destroy)(void*); - BOOL (*p_context_copy)(void*,void*,UINT); BOOL (*p_context_share)(void*,void*); BOOL (*p_context_flush)(void*,HWND,HDC,int,BOOL); BOOL (*p_context_make_current)(HDC,HDC,void*);