From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/opengl.c | 6 +++--- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 10 +++++----- dlls/winewayland.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 14 +++++++------- include/wine/opengl_driver.h | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index 5bde88ae3c6..651448b62f2 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -231,7 +231,7 @@ failed: return NULL; }
-static const char *osmesa_init_wgl_extensions(void) +static const char *osmesa_init_wgl_extensions( struct opengl_funcs *funcs ) { return ""; } @@ -426,7 +426,7 @@ static BOOL nulldrv_describe_pixel_format( int format, struct wgl_pixel_format * return TRUE; }
-static const char *nulldrv_init_wgl_extensions(void) +static const char *nulldrv_init_wgl_extensions( struct opengl_funcs *funcs ) { return ""; } @@ -1366,7 +1366,7 @@ static void display_funcs_init(void) display_funcs->p_wglGetProcAddress = win32u_display_wglGetProcAddress; display_funcs->p_get_pixel_formats = win32u_display_get_pixel_formats;
- strcpy( wgl_extensions, display_driver_funcs->p_init_wgl_extensions() ); + strcpy( wgl_extensions, display_driver_funcs->p_init_wgl_extensions( display_funcs ) ); display_funcs->p_wglGetPixelFormat = win32u_wglGetPixelFormat; display_funcs->p_wglSetPixelFormat = win32u_wglSetPixelFormat;
diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index ba71c717f4a..d65d4f2d565 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -440,7 +440,7 @@ static void register_extension( const char *ext ) TRACE( "%s\n", ext ); }
-static const char *android_init_wgl_extensions(void) +static const char *android_init_wgl_extensions( struct opengl_funcs *funcs ) { register_extension("WGL_EXT_framebuffer_sRGB"); return wgl_extensions; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 0fc78f247c7..c5ad5e18a09 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2729,7 +2729,7 @@ static void register_extension(const char *ext) TRACE("'%s'\n", ext); }
-static const char *macdrv_init_wgl_extensions(void) +static const char *macdrv_init_wgl_extensions(struct opengl_funcs *funcs) { /* * ARB Extensions @@ -2767,10 +2767,10 @@ static const char *macdrv_init_wgl_extensions(void) */
register_extension("WGL_WINE_query_renderer"); - opengl_funcs.p_wglQueryCurrentRendererIntegerWINE = macdrv_wglQueryCurrentRendererIntegerWINE; - opengl_funcs.p_wglQueryCurrentRendererStringWINE = macdrv_wglQueryCurrentRendererStringWINE; - opengl_funcs.p_wglQueryRendererIntegerWINE = macdrv_wglQueryRendererIntegerWINE; - opengl_funcs.p_wglQueryRendererStringWINE = macdrv_wglQueryRendererStringWINE; + funcs->p_wglQueryCurrentRendererIntegerWINE = macdrv_wglQueryCurrentRendererIntegerWINE; + funcs->p_wglQueryCurrentRendererStringWINE = macdrv_wglQueryCurrentRendererStringWINE; + funcs->p_wglQueryRendererIntegerWINE = macdrv_wglQueryRendererIntegerWINE; + funcs->p_wglQueryRendererStringWINE = macdrv_wglQueryRendererStringWINE;
return gl_info.wglExtensions; } diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index ef7c348a584..3285af9a505 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -811,7 +811,7 @@ static BOOL init_opengl_funcs(void) return TRUE; }
-static const char *wayland_init_wgl_extensions(void) +static const char *wayland_init_wgl_extensions(struct opengl_funcs *funcs) { if (has_egl_ext_pixel_format_float) { diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index de0917062b7..d6f18867f7a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1930,7 +1930,7 @@ static void register_extension(const char *ext) TRACE("'%s'\n", ext); }
-static const char *x11drv_init_wgl_extensions(void) +static const char *x11drv_init_wgl_extensions( struct opengl_funcs *funcs ) { wglExtensions[0] = 0;
@@ -1982,8 +1982,8 @@ static const char *x11drv_init_wgl_extensions(void) if (has_extension(glExtensions, "GL_NV_vertex_array_range")) { register_extension( "WGL_NV_vertex_array_range" ); - opengl_funcs.p_wglAllocateMemoryNV = pglXAllocateMemoryNV; - opengl_funcs.p_wglFreeMemoryNV = pglXFreeMemoryNV; + funcs->p_wglAllocateMemoryNV = pglXAllocateMemoryNV; + funcs->p_wglFreeMemoryNV = pglXFreeMemoryNV; }
if (has_extension(glxExtensions, "GLX_OML_swap_method")) @@ -1994,10 +1994,10 @@ static const char *x11drv_init_wgl_extensions(void) if (has_extension( glxExtensions, "GLX_MESA_query_renderer" )) { register_extension( "WGL_WINE_query_renderer" ); - opengl_funcs.p_wglQueryCurrentRendererIntegerWINE = X11DRV_wglQueryCurrentRendererIntegerWINE; - opengl_funcs.p_wglQueryCurrentRendererStringWINE = X11DRV_wglQueryCurrentRendererStringWINE; - opengl_funcs.p_wglQueryRendererIntegerWINE = X11DRV_wglQueryRendererIntegerWINE; - opengl_funcs.p_wglQueryRendererStringWINE = X11DRV_wglQueryRendererStringWINE; + funcs->p_wglQueryCurrentRendererIntegerWINE = X11DRV_wglQueryCurrentRendererIntegerWINE; + funcs->p_wglQueryCurrentRendererStringWINE = X11DRV_wglQueryCurrentRendererStringWINE; + funcs->p_wglQueryRendererIntegerWINE = X11DRV_wglQueryRendererIntegerWINE; + funcs->p_wglQueryRendererStringWINE = X11DRV_wglQueryRendererStringWINE; }
return wglExtensions; diff --git a/include/wine/opengl_driver.h b/include/wine/opengl_driver.h index decdaec270d..7d8bed72d60 100644 --- a/include/wine/opengl_driver.h +++ b/include/wine/opengl_driver.h @@ -61,7 +61,7 @@ struct wgl_pixel_format #ifdef WINE_UNIX_LIB
/* Wine internal opengl driver version, needs to be bumped upon opengl_funcs changes. */ -#define WINE_OPENGL_DRIVER_VERSION 31 +#define WINE_OPENGL_DRIVER_VERSION 32
struct wgl_context; struct wgl_pbuffer; @@ -116,7 +116,7 @@ struct opengl_driver_funcs void *(*p_get_proc_address)(const char *); UINT (*p_init_pixel_formats)(UINT*); BOOL (*p_describe_pixel_format)(int,struct wgl_pixel_format*); - const char *(*p_init_wgl_extensions)(void); + const char *(*p_init_wgl_extensions)(struct opengl_funcs *funcs); BOOL (*p_set_pixel_format)(HWND,int,int,BOOL); BOOL (*p_swap_buffers)(void*,HWND,HDC,int); BOOL (*p_context_create)(HDC,int,void*,const int*,void**);