[cogl] glx: Bail from _renderer_connect if not GL driver



commit 912d46817edabe8419a842e6f3d4ecc9bf09eead
Author: Robert Bragg <robert linux intel com>
Date:   Fri Jul 22 00:00:51 2011 +0100

    glx: Bail from _renderer_connect if not GL driver
    
    The GLX winsys is only compatible with GL drivers so we now bail out
    from cogl-winsys-glx.c:_cogl_winsys_renderer_connect if a GLES driver
    has been chosen.
    
    Reviewed-by: Neil Roberts <neil linux intel com>

 cogl/winsys/cogl-winsys-glx.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
index a092bc7..0a2fe00 100644
--- a/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/winsys/cogl-winsys-glx.c
@@ -312,6 +312,14 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
   if (!_cogl_xlib_renderer_connect (renderer, error))
     goto error;
 
+  if (renderer->driver != COGL_DRIVER_GL)
+    {
+      g_set_error (error, COGL_WINSYS_ERROR,
+                   COGL_WINSYS_ERROR_INIT,
+                   "GLX Backend can only be used in conjunction with OpenGL");
+      goto error;
+    }
+
   glx_renderer->libgl_module = g_module_open (COGL_GL_LIBNAME,
                                               G_MODULE_BIND_LAZY);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]