Looks good to me AFAICT.
I had independently pushed a fix similar to the first chunk in your patch. I
think it matches your's verbatim so there should be no conflict when you rebase.
Jose
----- Original Message -----
> From: Brian Paul <bri...@vmware.com>
>
> To fix fall-out from recent commits.
> ---
> .../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);
> 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)
> {
> --
> 1.7.9.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
