From 960ab06da05390a5f53163016dddd51ba118b7bc Mon Sep 17 00:00:00 2001 From: James Benton Date: Fri, 14 Sep 2012 13:29:58 +0100 Subject: [PATCH] llvmpipe: Update llvmpipe_is_format_unswizzled to reflect latest changes. Reviewed-by: Jose Fonseca --- src/gallium/drivers/llvmpipe/lp_texture.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index 3d0acdfeb8f..e6061230dd1 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -762,10 +762,6 @@ llvmpipe_is_format_unswizzled( enum pipe_format format ) const struct util_format_description *desc = util_format_description(format); unsigned chan; - if (format == PIPE_FORMAT_B8G8R8X8_UNORM || format == PIPE_FORMAT_B8G8R8A8_UNORM) { - return FALSE; - } - if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN || desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB || desc->block.width != 1 || @@ -787,11 +783,6 @@ llvmpipe_is_format_unswizzled( enum pipe_format format ) return FALSE; } - /* All code assumes alpha is the last channel */ - if (desc->nr_channels == 4 && desc->swizzle[3] < 3) { - return FALSE; - } - return TRUE; } -- 2.30.2