diff options
| author | Marek Olšák <[email protected]> | 2016-04-16 14:05:47 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-04-22 01:30:39 +0200 |
| commit | fb523cb6ad3ffef22ab4b9cce9e53859c17c5739 (patch) | |
| tree | 45b67da368c4c387329e5887ab6d49d61f0b85a9 /src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c | |
| parent | ed23335a313dfc9cec26999c0adffe3ab3a73a58 (diff) | |
gallium: merge PIPE_SWIZZLE_* and UTIL_FORMAT_SWIZZLE_*
Use PIPE_SWIZZLE_* everywhere.
Use X/Y/Z/W/0/1 instead of RED, GREEN, BLUE, ALPHA, ZERO, ONE.
The new enum is called pipe_swizzle.
Acked-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c b/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c index e4849fe043f..a6311a1ce84 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c @@ -353,7 +353,7 @@ lp_build_float_to_srgb_packed(struct gallivm_state *gallivm, dst = lp_build_zero(gallivm, int32_type); for (chan = 0; chan < dst_fmt->nr_channels; chan++) { - if (dst_fmt->swizzle[chan] <= UTIL_FORMAT_SWIZZLE_W) { + if (dst_fmt->swizzle[chan] <= PIPE_SWIZZLE_W) { unsigned ls; LLVMValueRef shifted, shift_val; ls = dst_fmt->channel[dst_fmt->swizzle[chan]].shift; |