[cogl/cogl-1.14] This reverts the first hunk from Jerome's last patch

[Robert Bragg <rbragg src gnome org>]

commit 8a1353a215abf0d51befda30796839e096546f58
Author: Robert Bragg <robert linux intel com>
Date:   Thu Jan 31 13:09:54 2013 +0000

    This reverts the first hunk from Jerome's last patch
    
    The first hunk from commit 93b7b4c850dd928bf21ee168a95641a8d631f713
    turned out to be redundant because GLX guarantees that configs returned
    by glXChooseFBConfig should be sorted with non msaa configs coming
    first. The second hunk is required since we use glXGetFBConfigs in that
    case which doesn't sort the configs.
    
    I had meant to drop this part of the patch before landing it but forgot.
    
    Reviewed-by: Neil Roberts <neil linux intel com>
    
    (cherry picked from commit b19fcc1869275826e952925af922125daf8a48de)

 cogl/winsys/cogl-winsys-glx.c |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
index 24aee14..10228cc 100644
--- a/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/winsys/cogl-winsys-glx.c
@@ -776,20 +776,13 @@ glx_attributes_from_framebuffer_config (CoglDisplay *display,
   attributes[i++] = GLX_STENCIL_SIZE;
   attributes[i++] = config->need_stencil ? 1: GLX_DONT_CARE;
 
-  if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4)
-    {
-       if (config->samples_per_pixel)
-         {
-            attributes[i++] = GLX_SAMPLE_BUFFERS;
-            attributes[i++] = 1;
-            attributes[i++] = GLX_SAMPLES;
-            attributes[i++] = config->samples_per_pixel;
-         }
-       else
-         {
-            attributes[i++] = GLX_SAMPLE_BUFFERS;
-            attributes[i++] = 0;
-         }
+  if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4 &&
+      config->samples_per_pixel)
+    {
+      attributes[i++] = GLX_SAMPLE_BUFFERS;
+      attributes[i++] = 1;
+      attributes[i++] = GLX_SAMPLES;
+      attributes[i++] = config->samples_per_pixel;
     }
 
   attributes[i++] = None;