[waffle] [PATCH 08/13] glx: remove dl_can_open() logic from supports_api()

Emil Velikov emil.l.velikov at gmail.com
Tue Apr 5 21:58:21 UTC 2016


As mentioned earlier with similar EGL commit - one should two to keep
the two separate.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/waffle/glx/glx_config.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/waffle/glx/glx_config.c b/src/waffle/glx/glx_config.c
index 58d241e..fc88a7a 100644
--- a/src/waffle/glx/glx_config.c
+++ b/src/waffle/glx/glx_config.c
@@ -54,8 +54,6 @@ static bool
 glx_config_check_context_attrs(struct glx_display *dpy,
                                const struct wcore_config_attrs *attrs)
 {
-    struct glx_platform *plat = glx_platform(dpy->wcore.platform);
-
     if (attrs->context_forward_compatible) {
         assert(attrs->context_api == WAFFLE_CONTEXT_OPENGL);
         assert(wcore_config_attrs_version_ge(attrs, 30));
@@ -104,12 +102,6 @@ glx_config_check_context_attrs(struct glx_display *dpy,
                              "to create an OpenGL ES1 context");
                 return false;
             }
-            else if (!linux_platform_dl_can_open(plat->linux,
-                                            WAFFLE_DL_OPENGL_ES1)) {
-                wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
-                             "failed to open the OpenGL ES1 library");
-                return false;
-            }
 
             return true;
 
@@ -122,12 +114,7 @@ glx_config_check_context_attrs(struct glx_display *dpy,
                              "to create an OpenGL ES2 context");
                 return false;
             }
-            if (!linux_platform_dl_can_open(plat->linux,
-                                            WAFFLE_DL_OPENGL_ES2)) {
-                wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
-                             "failed to open the OpenGL ES2 library");
-                return false;
-            }
+
             return true;
 
         case WAFFLE_CONTEXT_OPENGL_ES3:
@@ -138,13 +125,6 @@ glx_config_check_context_attrs(struct glx_display *dpy,
                 return false;
             }
 
-            if (!linux_platform_dl_can_open(plat->linux,
-                                            WAFFLE_DL_OPENGL_ES3)) {
-                wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
-                             "failed to open the OpenGL ES3 library");
-                return false;
-            }
-
             return true;
 
         default:
-- 
2.8.0



More information about the waffle mailing list