xserver: Branch 'master'

[Keith Packard]

 hw/xwin/glx/indirect.c |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 44d502c6f1d03a9e548f0941cde0228b6fde8394
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Sun Oct 6 16:45:52 2013 +0100

    hw/xwin: Fix for "glx: Remove screen number from __GLXconfig"
    
    Fix compilation after commit c3c976f54c3c282d6fa6c8360688e036bc43d210 "glx:
    Remove screen number from __GLXconfig"
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 02f9b0e..b79f023 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -2014,9 +2014,6 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen)
         else
             c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
 
-        /* EXT_import_context */
-        c->base.screen = screen->base.pScreen->myNum;
-
         /* EXT_texture_from_pixmap */
         c->base.bindToTextureRgb = -1;
         c->base.bindToTextureRgba = -1;
@@ -2393,9 +2390,6 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
             c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
         }
 
-        /* EXT_import_context */
-        c->base.screen = screen->base.pScreen->myNum;
-
         /* EXT_texture_from_pixmap */
         /*
            Mesa's DRI configs always have bindToTextureRgb/Rgba TRUE (see driCreateConfigs(), so setting