llvmpipe: Update llvmpipe_is_format_unswizzled to reflect latest changes.
authorJames Benton <jbenton@vmware.com>
Fri, 14 Sep 2012 12:29:58 +0000 (13:29 +0100)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 28 Nov 2012 19:14:36 +0000 (19:14 +0000)
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
src/gallium/drivers/llvmpipe/lp_texture.c

index 3d0acdfeb8fbd4e84d153aba4584adbd4b809ae4..e6061230dd1ce6786c020b791f4ee73219dea1f6 100644 (file)
@@ -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;
 }