[PATCH 16/19] glx: Remove screen number from __GLXconfig

[Jon TURNEY]

On 21/08/2013 22:25, Adam Jackson wrote:
> Not used.  There's no real reason to match against this instead of
> matching against fbconfig or visual ID anyway.
> 
> Signed-off-by: Adam Jackson <ajax-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
> ---
>  glx/glxscreens.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/glx/glxscreens.h b/glx/glxscreens.h
> index 19a2599..c8119fd 100644
> --- a/glx/glxscreens.h
> +++ b/glx/glxscreens.h
> @@ -92,8 +92,6 @@ struct __GLXconfig {
>      /* OML_swap_method */
>      GLint swapMethod;
>  
> -    GLint screen;
> -
>      /* EXT_texture_from_pixmap */
>      GLint bindToTextureRgb;
>      GLint bindToTextureRgba;
> 

Not used, but was being set in hw/xwin/glx, so that needs to be removed as well.

-------------- next part --------------
>From 078de5de250d55a9d9c0b6656e1c765c2d245189 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Sun, 6 Oct 2013 16:45:52 +0100
Subject: [PATCH] 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>
---
 hw/xwin/glx/indirect.c | 6 ------
 1 file changed, 6 deletions(-)

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
-- 
1.8.3.4