[gtk+/wip/ebassi/gl-context-realize: 1/8] Switch GDK_GL_PROFILE_DEFAULT to mean 3_2_CORE
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/ebassi/gl-context-realize: 1/8] Switch GDK_GL_PROFILE_DEFAULT to mean 3_2_CORE
- Date: Mon, 9 Feb 2015 15:41:45 +0000 (UTC)
commit 4bf387eb37a0343c54812000ecabc5bab48a5347
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Jan 28 12:31:36 2015 +0000
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 88d3223..fbdb02a 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 b8fe112..b8f8d11 100644
--- a/gdk/win32/gdkglcontext-win32.c
+++ b/gdk/win32/gdkglcontext-win32.c
@@ -505,9 +505,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 0e56350..8b11c82 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)))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]