AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdkdisplay-win32.c: Clean up GL initialization further

Browse Source
This commit is contained in:
Chun-wei Fan 2022-01-19 00:18:07 +08:00
parent 43839898b3
commit 0fe37d1828
1 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gdk/win32/gdkdisplay-win32.c
View File

@ -1181,7 +1181,6 @@ gdk_win32_display_init_gl (GdkDisplay *display,
{
GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
HDC init_gl_hdc = NULL;
gboolean is_egl = FALSE;
if (display_win32->dummy_context_wgl.hdc == NULL)
display_win32->dummy_context_wgl.hdc = GetDC (display_win32->hwnd);
@ -1205,53 +1204,40 @@ gdk_win32_display_init_gl (GdkDisplay *display,
init_gl_hdc,
FALSE,
error))
is_egl = TRUE;
}
#endif
if (!is_egl)
{
g_clear_error (error);
if (gdk_win32_display_init_wgl (display, error))
{
gdk_gl_backend_use (GDK_GL_WGL);
return g_object_new (GDK_TYPE_WIN32_GL_CONTEXT_WGL,
return g_object_new (GDK_TYPE_WIN32_GL_CONTEXT_EGL,
"display", display,
NULL);
}
}
#ifdef HAVE_EGL
if (!is_egl)
{
g_clear_error (error);
if (gdk_display_init_egl (display,
EGL_PLATFORM_ANGLE_ANGLE,
init_gl_hdc,
TRUE,
error))
is_egl = TRUE;
}
if (is_egl)
{
GdkGLContext *gl_context = NULL;
/* We want to use a GLES 3.0+ context for libANGLE GLES */
gdk_gl_backend_use (GDK_GL_EGL);
gl_context = g_object_new (GDK_TYPE_WIN32_GL_CONTEXT_EGL,
"display", display,
NULL);
gdk_gl_context_set_allowed_apis (gl_context, GDK_GL_API_GLES);
gdk_gl_context_set_required_version (gl_context, 3, 0);
return gl_context;
else
g_clear_error (error);
}
#endif
g_return_val_if_reached (NULL);
if (gdk_win32_display_init_wgl (display, error))
{
return g_object_new (GDK_TYPE_WIN32_GL_CONTEXT_WGL,
"display", display,
NULL);
}
#ifdef HAVE_EGL
g_clear_error (error);
if (gdk_display_init_egl (display,
EGL_PLATFORM_ANGLE_ANGLE,
init_gl_hdc,
TRUE,
error))
{
return g_object_new (GDK_TYPE_WIN32_GL_CONTEXT_EGL,
"display", display,
NULL);
}
#endif
return NULL;
}
/**