mesa: Changes to 'upstream-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 src/glx/x11/glxext.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 0e080548f99a3fdea3afea13f48406ac935f5add
Author: Brian Paul <brianp@vmware.com>
Date:   Thu Jun 3 09:44:31 2010 -0600

    glx: fix regression with GLX_USE_GL
    
    update for fbconfig_style_tags
    
    Based on commit 26a9b7e4c737c89b47844303bb7413ceab0280a5 from master.

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index bdc6e31..387c081 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -438,6 +438,10 @@ __glXInitializeVisualConfigFromTags(__GLcontextModes * config, int count,
       case GLX_Y_INVERTED_EXT:
          config->yInverted = *bp++;
          break;
+      case GLX_USE_GL:
+         if (fbconfig_style_tags)
+            bp++;
+         break;
       case None:
          i = count;
          break;