Module: Mesa Branch: 10.4 Commit: dbf82d753b21ad6e8deefe745cf827e0d97bb638 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbf82d753b21ad6e8deefe745cf827e0d97bb638
Author: Ilia Mirkin <[email protected]> Date: Fri Feb 13 23:21:36 2015 -0500 nvc0: bail out of 2d blits with non-A8_UNORM alpha formats This fixes the teximage-colors uploads with GL_ALPHA format and non-GL_UNSIGNED_BYTE type. Signed-off-by: Ilia Mirkin <[email protected]> Cc: "10.4 10.5" <[email protected]> (cherry picked from commit 68e4f3f572b1e629f32a73ae618dc0b016f631b1) --- src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c index 17fe66d..b142156 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c @@ -1401,11 +1401,14 @@ nvc0_blit(struct pipe_context *pipe, const struct pipe_blit_info *info) } else if (!nv50_2d_src_format_faithful(info->src.format)) { if (!util_format_is_luminance(info->src.format)) { + if (!nv50_2d_dst_format_ops_supported(info->dst.format)) + eng3d = TRUE; + else if (util_format_is_intensity(info->src.format)) eng3d = info->src.format != PIPE_FORMAT_I8_UNORM; else - if (!nv50_2d_dst_format_ops_supported(info->dst.format)) - eng3d = TRUE; + if (util_format_is_alpha(info->src.format)) + eng3d = info->src.format != PIPE_FORMAT_A8_UNORM; else eng3d = !nv50_2d_format_supported(info->src.format); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
