[waffle] [PATCH (maint-1.4)] glx: Fix requirements for creation of ES2 context

Chad Versace chad.versace at linux.intel.com
Fri Dec 5 16:44:28 PST 2014


To create an ES2 context, Waffle required
GLX_EXT_create_context_es2_profile. Fix Waffle to require either
GLX_EXT_create_context_es_profile *or*
GLX_EXT_create_context_es2_profile, because
GLX_EXT_create_context_es_profile is an updated variant of
GLX_EXT_create_context_es2_profile that supercedes it.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 src/waffle/glx/glx_config.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/waffle/glx/glx_config.c b/src/waffle/glx/glx_config.c
index bad3531..e077b07 100644
--- a/src/waffle/glx/glx_config.c
+++ b/src/waffle/glx/glx_config.c
@@ -121,8 +121,10 @@ glx_config_check_context_attrs(struct glx_display *dpy,
             assert(attrs->context_major_version == 2);
             assert(!attrs->context_forward_compatible);
 
-            if (!dpy->EXT_create_context_es2_profile) {
+            if (!dpy->EXT_create_context_es_profile
+                && !dpy->EXT_create_context_es2_profile) {
                 wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
+                             "GLX_EXT_create_context_es_profile or "
                              "GLX_EXT_create_context_es2_profile is required "
                              "to create an OpenGL ES2 context");
                 return false;
-- 
2.1.2.1.g5433a3e



More information about the waffle mailing list