callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdkglcontext-win32.c: Avoid C4715 warning

Browse Source 
We can just group the code for the desktop GL codepath and the EGL
codepath a bit so that we can just have a single location where we
return TRUE upon a successful setup of our WGL/EGL context, and avoid
the C4715 warning that is considered an error when building with
GLib-2.68.x or later using Visual Studio, when we are building without
EGL support.
This commit is contained in:
Chun-wei Fan
2021-04-16 12:28:46 +08:00
parent 915d0b39a9
commit 416e6b9cdd
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/win32/gdkglcontext-win32.c
View File

@ -589,8 +589,6 @@ _gdk_win32_display_init_gl (GdkDisplay *display,
gboolean disable_wgl = FALSE; gboolean disable_wgl = FALSE;
#ifdef GDK_WIN32_ENABLE_EGL #ifdef GDK_WIN32_ENABLE_EGL
EGLDisplay egl_disp;
disable_wgl = ((_gdk_gl_flags & GDK_GL_GLES) != 0) || disable_wgl = ((_gdk_gl_flags & GDK_GL_GLES) != 0) ||
display_win32->running_on_arm64; display_win32->running_on_arm64;
#endif #endif
@ -655,11 +653,12 @@ _gdk_win32_display_init_gl (GdkDisplay *display,
wglMakeCurrent (NULL, NULL); wglMakeCurrent (NULL, NULL);
_destroy_dummy_gl_context (dummy); _destroy_dummy_gl_context (dummy);
return TRUE;
} }
#ifdef GDK_WIN32_ENABLE_EGL #ifdef GDK_WIN32_ENABLE_EGL
egl_disp = _gdk_win32_get_egl_display (display_win32); else
{
EGLDisplay egl_disp = _gdk_win32_get_egl_display (display_win32);
if (egl_disp == EGL_NO_DISPLAY || if (egl_disp == EGL_NO_DISPLAY ||
!eglInitialize (egl_disp, NULL, NULL)) !eglInitialize (egl_disp, NULL, NULL))
@ -692,9 +691,10 @@ _gdk_win32_display_init_gl (GdkDisplay *display,
display_win32->egl_version % 10, display_win32->egl_version % 10,
eglQueryString (display_win32->egl_disp, EGL_VENDOR), eglQueryString (display_win32->egl_disp, EGL_VENDOR),
display_win32->hasEglSurfacelessContext ? "yes" : "no")); display_win32->hasEglSurfacelessContext ? "yes" : "no"));
}
#endif
return TRUE; return TRUE;
#endif
} }
/* Setup the legacy context after creating it */ /* Setup the legacy context after creating it */