diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-04-15 14:33:20 +0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2023-04-21 09:28:59 +0200 |
commit | 4e305e215b5acab9fc913135f267f1550941c453 (patch) | |
tree | bc1a12ea11a0282963da4fe19c09e45cf43a8ad5 | |
parent | 3f29f65396f3be7cdfc4899075aef79d2f61215c (diff) | |
download | gtk+-4e305e215b5acab9fc913135f267f1550941c453.tar.gz |
gdk: drop libangle GLES minimum version
GLES 2.0 version is fine now with current gtk according to B. Otte.
Let's use the same minimum requirement for all implementations.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-rw-r--r-- | gdk/gdkdisplay.c | 2 | ||||
-rw-r--r-- | gdk/gdkdisplayprivate.h | 1 | ||||
-rw-r--r-- | gdk/gdkglcontext.c | 14 | ||||
-rw-r--r-- | gdk/gdkglcontextprivate.h | 6 | ||||
-rw-r--r-- | gdk/x11/gdkglcontext-glx.c | 2 |
5 files changed, 4 insertions, 21 deletions
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index bebe26f38c..4f6fc60d2b 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -1723,8 +1723,6 @@ gdk_display_init_egl (GdkDisplay *self, epoxy_has_egl_extension (priv->egl_display, "EGL_KHR_no_config_context"); self->have_egl_pixel_format_float = epoxy_has_egl_extension (priv->egl_display, "EGL_EXT_pixel_format_float"); - self->have_egl_win32_libangle = - epoxy_has_egl_extension (priv->egl_display, "EGL_ANGLE_d3d_share_handle_client_buffer"); if (self->have_egl_no_config_context) priv->egl_config_high_depth = gdk_display_create_egl_config (self, diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h index df88bec6ac..2d09708bd4 100644 --- a/gdk/gdkdisplayprivate.h +++ b/gdk/gdkdisplayprivate.h @@ -109,7 +109,6 @@ struct _GdkDisplay guint have_egl_buffer_age : 1; guint have_egl_no_config_context : 1; guint have_egl_pixel_format_float : 1; - guint have_egl_win32_libangle : 1; }; struct _GdkDisplayClass diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index a46ffdb9d9..284db68e20 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -295,7 +295,6 @@ gdk_gl_context_create_egl_context (GdkGLContext *context, /* We will use the default version matching the context status * unless the user requested a version which makes sense */ gdk_gl_context_get_matching_version (api, legacy, - display->have_egl_win32_libangle, &min_major, &min_minor); gdk_gl_context_get_clipped_version (context, min_major, min_minor, @@ -968,7 +967,6 @@ gdk_gl_context_get_forward_compatible (GdkGLContext *context) void gdk_gl_context_get_matching_version (GdkGLAPI api, gboolean legacy, - gboolean win32_libangle, int *major, int *minor) { @@ -989,16 +987,8 @@ gdk_gl_context_get_matching_version (GdkGLAPI api, } else { - if (win32_libangle) - { - maj = GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MAJOR; - min = GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MINOR; - } - else - { - maj = GDK_GL_MIN_GLES_VERSION_MAJOR; - min = GDK_GL_MIN_GLES_VERSION_MINOR; - } + maj = GDK_GL_MIN_GLES_VERSION_MAJOR; + min = GDK_GL_MIN_GLES_VERSION_MINOR; } if (major != NULL) diff --git a/gdk/gdkglcontextprivate.h b/gdk/gdkglcontextprivate.h index 81432a2e99..d9860b11ef 100644 --- a/gdk/gdkglcontextprivate.h +++ b/gdk/gdkglcontextprivate.h @@ -37,8 +37,7 @@ G_BEGIN_DECLS * Backends should make sure to never create a context of a previous version. * * The macros refer to OpenGL; OpenGL with OPENGL_COMPATIBILITY_PROFILE_BIT as - * OPENGL_PROFILE_MASK; OpenGL ES; and OpenGL ES win32 Angle implementation, - * respectively + * OPENGL_PROFILE_MASK; and OpenGL ES respectively */ #define GDK_GL_MIN_GL_VERSION_MAJOR (3) #define GDK_GL_MIN_GL_VERSION_MINOR (2) @@ -46,8 +45,6 @@ G_BEGIN_DECLS #define GDK_GL_MIN_GL_LEGACY_VERSION_MINOR (0) #define GDK_GL_MIN_GLES_VERSION_MAJOR (2) #define GDK_GL_MIN_GLES_VERSION_MINOR (0) -#define GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MAJOR (3) -#define GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MINOR (0) typedef enum { GDK_GL_NONE = 0, @@ -140,7 +137,6 @@ void gdk_gl_context_get_clipped_version (GdkGLContext int *minor); void gdk_gl_context_get_matching_version (GdkGLAPI api, gboolean legacy, - gboolean win32_libangle, int *major, int *minor); diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c index db3040442c..bdcd3042cc 100644 --- a/gdk/x11/gdkglcontext-glx.c +++ b/gdk/x11/gdkglcontext-glx.c @@ -488,7 +488,7 @@ gdk_x11_context_create_glx_context (GdkGLContext *context, /* We will use the default version matching the context status * unless the user requested a version which makes sense */ - gdk_gl_context_get_matching_version (api, legacy, 0, + gdk_gl_context_get_matching_version (api, legacy, &min_major, &min_minor); gdk_gl_context_get_clipped_version (context, min_major, min_minor, &major, &minor); |