[Mesa-dev] [PATCH] swrast: Move assert for 'slice' in to check_map_teximage

[Alejandro Piñeiro]

On 14/03/16 18:44, Anuj Phogat wrote:
> Cc: Alejandro Piñeiro <apinheiro at igalia.com>
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  src/mesa/swrast/s_texture.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
> index 9ccd0e3..25918e3 100644
> --- a/src/mesa/swrast/s_texture.c
> +++ b/src/mesa/swrast/s_texture.c
> @@ -188,6 +188,7 @@ check_map_teximage(const struct gl_texture_image *texImage,
>     assert(y < texImage->Height || texImage->Height == 0);
>     assert(x + w <= texImage->Width);
>     assert(y + h <= texImage->Height);
> +   assert(slice < texture_slices(texImage));
>  }
>  
>  /**
> @@ -240,7 +241,6 @@ _swrast_map_teximage(struct gl_context *ctx,
>     assert(swImage->Buffer);
>     assert(swImage->Buffer == swImage->ImageSlices[0]);
>  
> -   assert(slice < texture_slices(texImage));
>     map = swImage->ImageSlices[slice];
>  
>     /* apply x/y offset to map address */

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>