From 2ce5cd09e55700eace84ced7a98c3a4c3846b397 Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Fri, 30 May 2025 11:06:57 +0200 Subject: [PATCH] egl: Remove check for GL or GLES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They are the only APIs supported these days and, most likely, going forward. Cc: mesa-stable Signed-off-by: Robert Mader Reviewed-by: Tapani Pälli Part-of: (cherry picked from commit ba1bd9aed88dbbc864c06a3ee1f4c9daf78c6af3) --- .pick_status.json | 2 +- src/egl/main/eglcontext.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4ade7b12ac3..fb277551fd3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1394,7 +1394,7 @@ "description": "egl: Remove check for GL or GLES", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c index 640a6a417c4..77204347e57 100644 --- a/src/egl/main/eglcontext.c +++ b/src/egl/main/eglcontext.c @@ -270,8 +270,7 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *disp, * contexts." */ if (!(disp->Extensions.KHR_create_context && api == EGL_OPENGL_API) && - !(disp->Version >= 15 && - (api == EGL_OPENGL_API || api == EGL_OPENGL_ES_API))) { + disp->Version < 15) { err = EGL_BAD_ATTRIBUTE; break; }