[PATCH 1/5] glx: pass screen into the convert function

[Ian Romanick]

On 07/12/2012 02:12 AM, Dave Airlie wrote:
> when robustness is enabled, this is required.
>
> Cc: Ian Romanick <idr at freedesktop.org>
> Signed-off-by: Dave Airlie <airlied at redhat.com>

Series is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>   glx/glxdri2.c |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/glx/glxdri2.c b/glx/glxdri2.c
> index 909de70..608cc17 100644
> --- a/glx/glxdri2.c
> +++ b/glx/glxdri2.c
> @@ -390,7 +390,8 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen)
>   }
>
>   static Bool
> -dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
> +dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs,
> +                         const uint32_t *attribs,
>                            unsigned *major_ver, unsigned *minor_ver,
>                            uint32_t *flags, int *api, int *reset, unsigned *error)
>   {
> @@ -513,7 +514,7 @@ create_driver_context(__GLXDRIcontext * context,
>           int api;
>
>           if (num_attribs != 0) {
> -            if (!dri2_convert_glx_attribs(num_attribs, attribs,
> +            if (!dri2_convert_glx_attribs(screen, num_attribs, attribs,
>                                             &major_ver, &minor_ver,
>                                             &flags, &api, &reset,
>                                             (unsigned *) error))
>