[PATCH 1/2] glx: Fix incorrect use of dri_interface.h version defines in extensions.

[Ian Romanick]

On 11/14/2013 05:40 PM, Eric Anholt wrote:
> Those defines are so you can compile-time check "do I have a
> dri_interface.h that defines this new field of the struct?"  You don't
> want the server to claim it implements the new struct just because you
> installed a new copy of Mesa.

Series is

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

These should also go to stable xserver trees.

> ---
>  glx/glxdri2.c      | 4 ++--
>  glx/glxdricommon.c | 2 +-
>  glx/glxdriswrast.c | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/glx/glxdri2.c b/glx/glxdri2.c
> index 1d74c8f..5034bb1 100644
> --- a/glx/glxdri2.c
> +++ b/glx/glxdri2.c
> @@ -780,7 +780,7 @@ dri2FlushFrontBuffer(__DRIdrawable * driDrawable, void *loaderPrivate)
>  }
>  
>  static const __DRIdri2LoaderExtension loaderExtension = {
> -    {__DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION},
> +    {__DRI_DRI2_LOADER, 3},
>      dri2GetBuffers,
>      dri2FlushFrontBuffer,
>      dri2GetBuffersWithFormat,
> @@ -788,7 +788,7 @@ static const __DRIdri2LoaderExtension loaderExtension = {
>  
>  #ifdef __DRI_USE_INVALIDATE
>  static const __DRIuseInvalidateExtension dri2UseInvalidate = {
> -    {__DRI_USE_INVALIDATE, __DRI_USE_INVALIDATE_VERSION}
> +    {__DRI_USE_INVALIDATE, 1}
>  };
>  #endif
>  
> diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
> index 1022c00..fc90272 100644
> --- a/glx/glxdricommon.c
> +++ b/glx/glxdricommon.c
> @@ -59,7 +59,7 @@ getUST(int64_t * ust)
>  }
>  
>  const __DRIsystemTimeExtension systemTimeExtension = {
> -    {__DRI_SYSTEM_TIME, __DRI_SYSTEM_TIME_VERSION},
> +    {__DRI_SYSTEM_TIME, 1},
>      getUST,
>      NULL,
>  };
> diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
> index c9962dc..aa083e0 100644
> --- a/glx/glxdriswrast.c
> +++ b/glx/glxdriswrast.c
> @@ -386,7 +386,7 @@ swrastGetImage(__DRIdrawable * draw,
>  }
>  
>  static const __DRIswrastLoaderExtension swrastLoaderExtension = {
> -    {__DRI_SWRAST_LOADER, __DRI_SWRAST_LOADER_VERSION},
> +    {__DRI_SWRAST_LOADER, 1},
>      swrastGetDrawableInfo,
>      swrastPutImage,
>      swrastGetImage
>