[clutter/wip/cogl-winsys-egl: 16/30] egl xlib platform fixes

[Robert Bragg <rbragg src gnome org>]

commit 0aec778f9771595e59baaa84984ab6491066ec8e
Author: Robert Bragg <robert linux intel com>
Date:   Mon Apr 18 15:58:33 2011 +0100

    egl xlib platform fixes

 clutter/cogl/cogl/winsys/cogl-winsys-egl.c |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/clutter/cogl/cogl/winsys/cogl-winsys-egl.c b/clutter/cogl/cogl/winsys/cogl-winsys-egl.c
index 70bc4ac..7fbd341 100644
--- a/clutter/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/clutter/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -221,7 +221,6 @@ static CoglXlibFilterReturn
 event_filter_cb (XEvent *xevent, void *data)
 {
   CoglContext *context = data;
-  CoglRendererEGL *egl_renderer = context->display->renderer->winsys;
 
   if (xevent->type == ConfigureNotify)
     {
@@ -344,9 +343,6 @@ static void
 update_winsys_features (CoglContext *context)
 {
   CoglDisplayEGL *egl_display = context->display->winsys;
-#ifdef COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT
-  CoglRendererXlib *xlib_renderer = context->display->renderer->winsys;
-#endif
   CoglRendererEGL *egl_renderer = context->display->renderer->winsys;
   const char *egl_extensions;
   int i;
@@ -397,8 +393,6 @@ update_winsys_features (CoglContext *context)
 static XVisualInfo *
 get_visual_info (CoglDisplay *display, EGLConfig egl_config)
 {
-  CoglDisplayXlib *xlib_display = display->winsys;
-  CoglDisplayEGL *egl_display = display->winsys;
   CoglRendererXlib *xlib_renderer = display->renderer->winsys;
   CoglRendererEGL *egl_renderer = display->renderer->winsys;
   XVisualInfo visinfo_template;
@@ -696,10 +690,6 @@ static gboolean
 create_context (CoglDisplay *display, GError **error)
 {
   CoglDisplayEGL *egl_display = display->winsys;
-#ifdef COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT
-  CoglDisplayXlib *xlib_display = display->winsys;
-  CoglRendererXlib *xlib_renderer = display->renderer->winsys;
-#endif
   gboolean support_transparent_windows;
   int retry_cookie = 0;
   gboolean status;
@@ -978,6 +968,8 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
 
       XFree (xvisinfo);
 
+      XMapWindow (xlib_renderer->xdpy, xwin);
+
       XSync (xlib_renderer->xdpy, False);
       xerror = _cogl_renderer_xlib_untrap_errors (display->renderer, &state);
       if (xerror)
@@ -1083,12 +1075,6 @@ _cogl_winsys_onscreen_bind (CoglOnscreen *onscreen)
   CoglDisplayEGL *egl_display = context->display->winsys;
   CoglRendererEGL *egl_renderer = context->display->renderer->winsys;
   CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
-#ifdef COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT
-  CoglDisplayXlib *xlib_display = context->display->winsys;
-  CoglRendererXlib *xlib_renderer = context->display->renderer->winsys;
-  CoglOnscreenXlib *xlib_onscreen = onscreen->winsys;
-  CoglXlibTrapState old_state;
-#endif
 
   if (egl_context->current_surface == egl_onscreen->egl_surface)
     return;