[Mesa-dev] [PATCH] intel: Fix segfault in intel_texsubimage_tiled_memcpy

[Kenneth Graunke]

On 09/26/2012 11:22 AM, Chad Versace wrote:
> The function segfaulted when a game called glTexSubImage2D on a texture
> with internalformat/format/type = GL_SLUMINANCE8/GL_BGRA/GL_UNSIGNED_BYTE.

Wait, is that what it was doing?  Specifying a four component format but
a single component (and sRGB, and deprecated) internal format?  That's
truly bizarre...wonder what on earth it's trying to do.

> The function only supports MESA_FORMAT_ARGB8888 and returns early if it
> detects an unsupported format. Clearly, its detection condition was
> insufficient. This patch fixes it to explicity check for
> MESA_FORMAT_ARGB8888.
> 
> CC: Kenneth Graunke <kenneth at whitecape.org>
> Signed-off-by: Chad Versace <chad.versace at linux.intel.com>

Your patch seems reasonable and does fix the problem I was seeing.
Thanks for the prompt response!

Reviewed-and-tested-by: Kenneth Graunke <kenneth at whitecape.org>

> ---
>  src/mesa/drivers/dri/intel/intel_tex_subimage.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
> index d3a8736..aa6f237 100644
> --- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c
> +++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
> @@ -199,8 +199,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
>      * varying the arithmetic loop below.
>      */
>     if (!intel->has_llc ||
> -       format != GL_BGRA ||
> -       type != GL_UNSIGNED_BYTE ||
> +       texImage->TexFormat != MESA_FORMAT_ARGB8888 ||
>         texImage->TexObject->Target != GL_TEXTURE_2D ||
>         texImage->Level != 0 ||
>         pixels == NULL ||
>