1*4882a593SmuzhiyunFrom 83f010dad9de71888efb43af7a5e40e2cc58ff2d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Fri, 7 Aug 2020 12:09:58 +0800 4*4882a593SmuzhiyunSubject: [PATCH 5/6] gdk: wayland: Fix GL init error for GLES 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUse EGL_OPENGL_ES_API when _gdk_gl_flags has GDK_GL_GLES. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSee: 9*4882a593Smuzhiyunhttps://gitlab.gnome.org/GNOME/gtk/-/issues/3028 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunTested with: 12*4882a593SmuzhiyunGDK_GL=gles gdkgears 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun gdk/wayland/gdkglcontext-wayland.c | 9 +++++++-- 17*4882a593Smuzhiyun 1 file changed, 7 insertions(+), 2 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c 20*4882a593Smuzhiyunindex a221025..2376959 100644 21*4882a593Smuzhiyun--- a/gdk/wayland/gdkglcontext-wayland.c 22*4882a593Smuzhiyun+++ b/gdk/wayland/gdkglcontext-wayland.c 23*4882a593Smuzhiyun@@ -326,8 +326,13 @@ gdk_wayland_display_init_gl (GdkDisplay *display) 24*4882a593Smuzhiyun if (!eglInitialize (dpy, &major, &minor)) 25*4882a593Smuzhiyun return FALSE; 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun- if (!eglBindAPI (EGL_OPENGL_API)) 28*4882a593Smuzhiyun- return FALSE; 29*4882a593Smuzhiyun+ if (_gdk_gl_flags & GDK_GL_GLES) { 30*4882a593Smuzhiyun+ if (!eglBindAPI (EGL_OPENGL_ES_API)) 31*4882a593Smuzhiyun+ return FALSE; 32*4882a593Smuzhiyun+ } else { 33*4882a593Smuzhiyun+ if (!eglBindAPI (EGL_OPENGL_API)) 34*4882a593Smuzhiyun+ return FALSE; 35*4882a593Smuzhiyun+ } 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun display_wayland->egl_display = dpy; 38*4882a593Smuzhiyun display_wayland->egl_major_version = major; 39*4882a593Smuzhiyun-- 40*4882a593Smuzhiyun2.20.1 41*4882a593Smuzhiyun 42