From d69cdf6c056f449ebdd0808b2fff071ef182acff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Sat, 15 Apr 2023 14:33:20 +0400
Subject: [PATCH] gdk: drop libangle GLES minimum version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 gdk/gdkdisplay.c           |  2 --
 gdk/gdkdisplayprivate.h    |  1 -
 gdk/gdkglcontext.c         | 14 ++------------
 gdk/gdkglcontextprivate.h  |  6 +-----
 gdk/x11/gdkglcontext-glx.c |  2 +-
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 32ad4aee7a..d2ae997c31 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 5fe690d9d0..af6fb0ebad 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -108,7 +108,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 8614ec3e83..8d38a0c50f 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -297,7 +297,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,
@@ -989,7 +988,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)
 {
@@ -1010,16 +1008,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 d80f52bca7..ac20742ea9 100644
--- a/gdk/gdkglcontextprivate.h
+++ b/gdk/gdkglcontextprivate.h
@@ -36,8 +36,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)
@@ -45,8 +44,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,
@@ -139,7 +136,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);