[Mesa-dev] [PATCH] glx/dri: fix assorted compiler warnings/errors

[Ian Romanick]

On 11/07/2013 07:04 PM, Brian Paul wrote:
> From: Brian Paul <brianp at vmware.com>
> 
> To fix fall-out from recent commits.

/me puts a paper bag on his head

I only built i915 and i965 before pushing.  Sorry about that.

With the issue below fixed,

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

I'll pick the fixes over to the 10.0 branch if you or Jose don't beat me
to it.

> ---
>  .../state_trackers/dri/common/dri_context.h        |    1 +
>  src/glx/dri2.h                                     |    2 ++
>  src/glx/glxclient.h                                |    2 +-
>  src/glx/query_renderer.c                           |    2 +-
>  src/mesa/drivers/dri/swrast/swrast.c               |    1 +
>  5 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gallium/state_trackers/dri/common/dri_context.h b/src/gallium/state_trackers/dri/common/dri_context.h
> index b87ce40..56dfa2c 100644
> --- a/src/gallium/state_trackers/dri/common/dri_context.h
> +++ b/src/gallium/state_trackers/dri/common/dri_context.h
> @@ -89,6 +89,7 @@ dri_create_context(gl_api api,
>  		   unsigned major_version,
>  		   unsigned minor_version,
>  		   uint32_t flags,
> +		   bool notify_reset,
>  		   unsigned *error,
>  		   void *sharedContextPrivate);
>  
> diff --git a/src/glx/dri2.h b/src/glx/dri2.h
> index c404a3a..90efde8 100644
> --- a/src/glx/dri2.h
> +++ b/src/glx/dri2.h
> @@ -45,6 +45,8 @@ typedef struct
>     unsigned int flags;
>  } DRI2Buffer;
>  
> +struct glx_screen;
> +
>  extern Bool
>  DRI2QueryExtension(Display * display, int *eventBase, int *errorBase);
>  
> diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
> index 7363327..257728d 100644
> --- a/src/glx/glxclient.h
> +++ b/src/glx/glxclient.h
> @@ -476,7 +476,7 @@ struct glx_screen_vtable {
>  						 unsigned *error);
>     int (*query_renderer_integer)(struct glx_screen *psc,
>                                   int attribute,
> -                                 int *value);
> +                                 unsigned int *value);

This breaks 'make check'.  I've attached a patch.

>     int (*query_renderer_string)(struct glx_screen *psc,
>                                  int attribute,
>                                  const char **value);
> diff --git a/src/glx/query_renderer.c b/src/glx/query_renderer.c
> index 981a844..9108ec2 100644
> --- a/src/glx/query_renderer.c
> +++ b/src/glx/query_renderer.c
> @@ -30,7 +30,7 @@ __glXQueryRendererInteger(struct glx_screen *psc, int attribute,
>                            unsigned int *value)
>  {
>     unsigned int values_for_query = 0;
> -   int buffer[32];
> +   unsigned int buffer[32];
>     int err;
>  
>     /* This probably means the caller is trying to use an extension function
> diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
> index bfa2efd..c062071 100644
> --- a/src/mesa/drivers/dri/swrast/swrast.c
> +++ b/src/mesa/drivers/dri/swrast/swrast.c
> @@ -664,6 +664,7 @@ dri_create_context(gl_api api,
>  		   unsigned major_version,
>  		   unsigned minor_version,
>  		   uint32_t flags,
> +		   bool notify_reset,
>  		   unsigned *error,
>  		   void *sharedContextPrivate)
>  {
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: query_renderer_unittest.patch
Type: application/pgp-keys
Size: 598 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20131108/223a82ac/attachment.key>