diff options
| author | Rob Clark <[email protected]> | 2014-05-18 15:19:34 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2014-05-18 16:05:06 -0400 |
| commit | acc1651711f682ede60b55c4501912ae538b739e (patch) | |
| tree | c659829f88d98ec696a574736d741ebc56a9dcd6 | |
| parent | 88ba9de917dfe92040f4e0508f18f6817987e538 (diff) | |
freedreno/a3xx: use util_format_compose_swizzles()
Signed-off-by: Rob Clark <[email protected]>
| -rw-r--r-- | src/gallium/drivers/freedreno/a3xx/fd3_util.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_util.c b/src/gallium/drivers/freedreno/a3xx/fd3_util.c index 2cc8b8b5ced..682b47d0836 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_util.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_util.c @@ -389,14 +389,14 @@ fd3_tex_swiz(enum pipe_format format, unsigned swizzle_r, unsigned swizzle_g, { const struct util_format_description *desc = util_format_description(format); - uint8_t swiz[] = { + unsigned char swiz[4] = { swizzle_r, swizzle_g, swizzle_b, swizzle_a, - PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_ONE, - PIPE_SWIZZLE_ONE, PIPE_SWIZZLE_ONE, - }; - - return A3XX_TEX_CONST_0_SWIZ_X(tex_swiz(swiz[desc->swizzle[0]])) | - A3XX_TEX_CONST_0_SWIZ_Y(tex_swiz(swiz[desc->swizzle[1]])) | - A3XX_TEX_CONST_0_SWIZ_Z(tex_swiz(swiz[desc->swizzle[2]])) | - A3XX_TEX_CONST_0_SWIZ_W(tex_swiz(swiz[desc->swizzle[3]])); + }, rswiz[4]; + + util_format_compose_swizzles(desc->swizzle, swiz, rswiz); + + return A3XX_TEX_CONST_0_SWIZ_X(tex_swiz(rswiz[0])) | + A3XX_TEX_CONST_0_SWIZ_Y(tex_swiz(rswiz[1])) | + A3XX_TEX_CONST_0_SWIZ_Z(tex_swiz(rswiz[2])) | + A3XX_TEX_CONST_0_SWIZ_W(tex_swiz(rswiz[3])); } |