Pushed, thanks.
Marek
On Sat, Dec 10, 2016 at 8:10 PM, Grazvydas Ignotas <nota...@gmail.com> wrote:
> Signed-off-by: Grazvydas Ignotas <nota...@gmail.com>
> ---
> no commit access, somebody please push
>
> src/gallium/drivers/radeonsi/si_blit.c | 2 +-
> src/gallium/drivers/radeonsi/si_state.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_blit.c
> b/src/gallium/drivers/radeonsi/si_blit.c
> index 83870e5..e15fe40 100644
> --- a/src/gallium/drivers/radeonsi/si_blit.c
> +++ b/src/gallium/drivers/radeonsi/si_blit.c
> @@ -972,7 +972,7 @@ static bool do_hardware_msaa_resolve(struct pipe_context
> *ctx,
> struct si_context *sctx = (struct si_context*)ctx;
> struct r600_texture *src = (struct r600_texture*)info->src.resource;
> struct r600_texture *dst = (struct r600_texture*)info->dst.resource;
> - struct r600_texture *rtmp;
> + MAYBE_UNUSED struct r600_texture *rtmp;
> unsigned dst_width = u_minify(info->dst.resource->width0,
> info->dst.level);
> unsigned dst_height = u_minify(info->dst.resource->height0,
> info->dst.level);
> enum pipe_format format = info->src.format;
> diff --git a/src/gallium/drivers/radeonsi/si_state.c
> b/src/gallium/drivers/radeonsi/si_state.c
> index 04c1a9f..984540d 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -3306,9 +3306,9 @@ static void si_emit_sample_mask(struct si_context
> *sctx, struct r600_atom *atom)
>
> static void si_delete_sampler_state(struct pipe_context *ctx, void *state)
> {
> +#ifdef DEBUG
> struct si_sampler_state *s = state;
>
> -#ifdef DEBUG
> assert(s->magic == SI_SAMPLER_STATE_MAGIC);
> s->magic = 0;
> #endif
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
