From f7497daee933cbfa328225eb318449054bab81f3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 28 Jan 2015 12:31:36 +0000 Subject: [PATCH] Switch GDK_GL_PROFILE_DEFAULT to mean 3_2_CORE Instead of LEGACY. https://bugzilla.gnome.org/show_bug.cgi?id=741946 --- gdk/wayland/gdkglcontext-wayland.c | 2 +- gdk/win32/gdkglcontext-win32.c | 3 +-- gdk/x11/gdkglcontext-x11.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c index 88d32232f4..fbdb02a1e3 100644 --- a/gdk/wayland/gdkglcontext-wayland.c +++ b/gdk/wayland/gdkglcontext-wayland.c @@ -368,7 +368,7 @@ gdk_wayland_window_create_gl_context (GdkWindow *window, } if (profile == GDK_GL_PROFILE_DEFAULT) - profile = GDK_GL_PROFILE_LEGACY; + profile = GDK_GL_PROFILE_3_2_CORE; if (profile == GDK_GL_PROFILE_3_2_CORE && !display_wayland->have_egl_khr_create_context) diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c index 3b165af1eb..7ac610be33 100644 --- a/gdk/win32/gdkglcontext-win32.c +++ b/gdk/win32/gdkglcontext-win32.c @@ -488,9 +488,8 @@ _gdk_win32_gl_context_realize (GdkGLContext *context, return FALSE; } - /* GDK_GL_PROFILE_DEFAULT is the same as GDK_GL_PROFILE_LEGACY for now */ if (profile == GDK_GL_PROFILE_DEFAULT) - profile = GDK_GL_PROFILE_LEGACY; + profile = GDK_GL_PROFILE_3_2_CORE; if (profile == GDK_GL_PROFILE_3_2_CORE) { diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index 0e56350f4d..8b11c82c6c 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -1195,7 +1195,7 @@ gdk_x11_window_create_gl_context (GdkWindow *window, /* GDK_GL_PROFILE_DEFAULT is currently equivalent to the LEGACY profile */ if (profile == GDK_GL_PROFILE_DEFAULT) - profile = GDK_GL_PROFILE_LEGACY; + profile = GDK_GL_PROFILE_3_2_CORE; if (!gdk_x11_screen_init_gl (gdk_window_get_screen (window))) {