From 9582fddb24fba071ea77aa2396aa5288639c3217 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 11 May 2009 12:39:46 +0100 Subject: [PATCH] [x11] Do not needlessly check XVisualInfo Since we are destroying any previously set VisualInfo we keep we know for sure that stage->xvisinfo is going to be None; hence, no reason to check this condition. --- clutter/glx/clutter-stage-glx.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/clutter/glx/clutter-stage-glx.c b/clutter/glx/clutter-stage-glx.c index 650cf9445..9616f9371 100644 --- a/clutter/glx/clutter-stage-glx.c +++ b/clutter/glx/clutter-stage-glx.c @@ -126,25 +126,23 @@ clutter_stage_glx_realize (ClutterActor *actor) { GLX_RGBA, GLX_DOUBLEBUFFER, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, GLX_STENCIL_SIZE, 1, 0 }; - if (stage_x11->xvisinfo) + if (stage_x11->xvisinfo != None) { XFree (stage_x11->xvisinfo); stage_x11->xvisinfo = None; } - /* The following check seems strange */ + stage_x11->xvisinfo = glXChooseVisual (stage_x11->xdpy, + stage_x11->xscreen, + gl_attributes); if (stage_x11->xvisinfo == None) - stage_x11->xvisinfo = glXChooseVisual (stage_x11->xdpy, - stage_x11->xscreen, - gl_attributes); - if (!stage_x11->xvisinfo) { g_critical ("Unable to find suitable GL visual."); goto fail;