From 6acf41147e0bf0a6c54f5d833f4c818ef46c426d Mon Sep 17 00:00:00 2001 From: Vasiliy Ulyanov Date: Wed, 16 Mar 2016 12:04:14 +0300 Subject: [PATCH] YaGL: skip GL_ARB_ES3_compatibility check ES3 compatibility extension seems to cause problems with yagl. Disable autodetection for the moment. Change-Id: I63f58f81551c25674586961a437c4e82966992b5 Signed-off-by: Vasiliy Ulyanov --- hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c | 7 ++++++- hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c b/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c index 9ce4bfd..51d333e 100644 --- a/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c +++ b/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c @@ -183,6 +183,7 @@ static bool yagl_egl_glx_get_gl_version(struct yagl_egl_glx *egl_glx, void (GLAPIENTRY *GetIntegerv)(GLenum, GLint*) = NULL; GLint i, num_extensions = 0; unsigned int j; + bool skip_compatibility_check = 1; YAGL_EGL_GLX_ENTER(yagl_egl_glx_get_gl_version, NULL); @@ -279,7 +280,11 @@ static bool yagl_egl_glx_get_gl_version(struct yagl_egl_glx *egl_glx, goto out; } - GetIntegerv(GL_NUM_EXTENSIONS, &num_extensions); + if (skip_compatibility_check) { + YAGL_LOG_INFO("Skipping GL_ARB_ES3_compatibility check"); + } else { + GetIntegerv(GL_NUM_EXTENSIONS, &num_extensions); + } for (i = 0; i < num_extensions; ++i) { const char *tmp = (const char *)GetStringi(GL_EXTENSIONS, i); diff --git a/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c index ca64baa..09599fd 100644 --- a/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c +++ b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c @@ -189,6 +189,7 @@ static bool yagl_egl_wgl_get_gl_version(YaglEglWglDriver *egl_wgl, void (GLAPIENTRY *GetIntegerv)(GLenum, GLint*) = NULL; GLint i, num_extensions = 0; unsigned int j; + bool skip_compatibility_check = 1; YAGL_EGL_WGL_ENTER(yagl_egl_wgl_get_gl_version, NULL); @@ -315,7 +316,11 @@ static bool yagl_egl_wgl_get_gl_version(YaglEglWglDriver *egl_wgl, goto out7; } - GetIntegerv(GL_NUM_EXTENSIONS, &num_extensions); + if (skip_compatibility_check) { + YAGL_LOG_INFO("Skipping GL_ARB_ES3_compatibility check"); + } else { + GetIntegerv(GL_NUM_EXTENSIONS, &num_extensions); + } for (i = 0; i < num_extensions; ++i) { const char *tmp = (const char *)GetStringi(GL_EXTENSIONS, i); -- 2.7.4