From: Dave Airlie Date: Tue, 10 May 2016 05:41:46 +0000 (+1000) Subject: mesa/meta: check for signed/unsigned int conversion for pbo getteximage X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b230d51a181aae0982d167e227d1833154133a5c;p=mesa.git mesa/meta: check for signed/unsigned int conversion for pbo getteximage When doing GetTexSubImage using a PBO, we should check if it involves a signed/unsigned conversion and bail if it does, just like in the other cases. This fixes: GL33-CTS.gtf32.GL3Tests.packed_pixels.packed_pixels_pbo on Haswell at least. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95324 Reviewed-by: Matt Turer Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Dave Airlie --- diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c index 62c3fce4249..988af91ce4e 100644 --- a/src/mesa/drivers/common/meta_tex_subimage.c +++ b/src/mesa/drivers/common/meta_tex_subimage.c @@ -355,6 +355,9 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims, */ if (need_signed_unsigned_int_conversion(rb->Format, format, type)) return false; + } else { + if (need_signed_unsigned_int_conversion(tex_image->TexFormat, format, type)) + return false; } /* For arrays, use a tall (height * depth) 2D texture but taking into