summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_fs.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-08-02 01:04:58 +0200
committerMarek Olšák <[email protected]>2011-08-02 18:49:30 +0200
commitbe7407b75b12c70e1925c10117937ae2b9e6711f (patch)
treefb6913b4eab9c78e86cd7f6bc6334c6135ad1003 /src/gallium/drivers/r300/r300_fs.c
parent0290a018a50bd4a3180af3233f145f4de7b63706 (diff)
gallium/util: add functions for manipulating swizzles
Some of those have been in drivers already.
Diffstat (limited to 'src/gallium/drivers/r300/r300_fs.c')
-rw-r--r--src/gallium/drivers/r300/r300_fs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c
index a9fd3ad40dd..6f21125f70a 100644
--- a/src/gallium/drivers/r300/r300_fs.c
+++ b/src/gallium/drivers/r300/r300_fs.c
@@ -180,9 +180,10 @@ static void get_external_state(
v->base.format == PIPE_FORMAT_LATC1_SNORM) {
unsigned char swizzle[4];
- util_format_combine_swizzles(swizzle,
+ util_format_compose_swizzles(
util_format_description(v->base.format)->swizzle,
- v->swizzle);
+ v->swizzle,
+ swizzle);
state->unit[i].texture_swizzle =
RC_MAKE_SWIZZLE(swizzle[0], swizzle[1],