From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/opengl.c | 53 ++++++++++++++++++++++++++++++++++-- include/wine/opengl_driver.h | 10 ++++++- 2 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index f0cca3b06b4..fea74a59313 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -70,6 +70,7 @@ struct wgl_pbuffer };
static const struct opengl_funcs *default_funcs; /* default GL function table from opengl32 */ +static struct egl_platform display_egl; static struct opengl_funcs display_funcs; static struct opengl_funcs memory_funcs;
@@ -226,11 +227,53 @@ static BOOL egl_init(void) return TRUE;
failed: - dlclose( display_funcs.egl_handle ); - display_funcs.egl_handle = NULL; + dlclose( funcs->egl_handle ); + funcs->egl_handle = NULL; return FALSE; }
+static void init_egl_platform( struct egl_platform *egl, struct opengl_funcs *funcs, + const struct opengl_driver_funcs *driver_funcs ) +{ + EGLNativeDisplayType platform_display; + const char *extensions; + EGLint major, minor; + EGLenum platform; + + if (!funcs->egl_handle || !driver_funcs->p_init_egl_platform) return; + + platform = driver_funcs->p_init_egl_platform( egl, &platform_display ); + if (!platform) egl->display = funcs->p_eglGetDisplay( EGL_DEFAULT_DISPLAY ); + else egl->display = funcs->p_eglGetPlatformDisplay( platform, platform_display, NULL ); + + if (!egl->display) + { + ERR( "Failed to open EGL display\n" ); + return; + } + + if (!funcs->p_eglInitialize( egl->display, &major, &minor )) return; + TRACE( "Initialized EGL display %p, version %d.%d\n", egl->display, major, minor ); + + if (!(extensions = funcs->p_eglQueryString( egl->display, EGL_EXTENSIONS ))) return; + TRACE( "EGL display extensions:\n" ); + dump_extensions( extensions ); + +#define CHECK_EXTENSION( ext ) \ + if (!has_extension( extensions, #ext )) \ + { \ + ERR( "Failed to find required extension %s\n", #ext ); \ + return; \ + } + CHECK_EXTENSION( EGL_KHR_create_context ); + CHECK_EXTENSION( EGL_KHR_create_context_no_error ); + CHECK_EXTENSION( EGL_KHR_no_config_context ); +#undef CHECK_EXTENSION + + egl->has_EGL_EXT_present_opaque = has_extension( extensions, "EGL_EXT_present_opaque" ); + egl->has_EGL_EXT_pixel_format_float = has_extension( extensions, "EGL_EXT_pixel_format_float" ); +} + #else /* SONAME_LIBEGL */
static BOOL egl_init(void) @@ -239,6 +282,11 @@ static BOOL egl_init(void) return FALSE; }
+static void init_egl_platform( struct egl_platform *egl, struct opengl_funcs *funcs, + const struct opengl_driver_funcs *driver_funcs ) +{ +} + #endif /* SONAME_LIBEGL */
#ifdef SONAME_LIBOSMESA @@ -1422,6 +1470,7 @@ static void display_funcs_init(void)
if ((status = user_driver->pOpenGLInit( WINE_OPENGL_DRIVER_VERSION, &display_funcs, &display_driver_funcs ))) WARN( "Failed to initialize the driver OpenGL functions, status %#x\n", status ); + init_egl_platform( &display_egl, &display_funcs, display_driver_funcs );
display_formats_count = display_driver_funcs->p_init_pixel_formats( &display_onscreen_count ); init_opengl_funcs( &display_funcs, display_driver_funcs ); diff --git a/include/wine/opengl_driver.h b/include/wine/opengl_driver.h index 6d271e4fc73..693c2b80d2e 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 33 +#define WINE_OPENGL_DRIVER_VERSION 34
struct wgl_context; struct wgl_pbuffer; @@ -113,9 +113,17 @@ struct opengl_funcs void *egl_handle; };
+struct egl_platform +{ + EGLDisplay display; + BOOL has_EGL_EXT_present_opaque; + BOOL has_EGL_EXT_pixel_format_float; +}; + /* interface between win32u and the user drivers */ struct opengl_driver_funcs { + GLenum (*p_init_egl_platform)(const struct egl_platform*,EGLNativeDisplayType*); void *(*p_get_proc_address)(const char *); UINT (*p_init_pixel_formats)(UINT*); BOOL (*p_describe_pixel_format)(int,struct wgl_pixel_format*);