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/tests/graw/graw_util.h | |
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/tests/graw/graw_util.h')
-rw-r--r-- | src/gallium/tests/graw/graw_util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/tests/graw/graw_util.h b/src/gallium/tests/graw/graw_util.h index 3c7dbd061cc..5d72bb9d4a7 100644 --- a/src/gallium/tests/graw/graw_util.h +++ b/src/gallium/tests/graw/graw_util.h @@ -315,10 +315,10 @@ graw_util_create_simple_sampler_view(const struct graw_info *info, memset(&sv_temp, 0, sizeof(sv_temp)); sv_temp.format = texture->format; sv_temp.texture = texture; - sv_temp.swizzle_r = PIPE_SWIZZLE_RED; - sv_temp.swizzle_g = PIPE_SWIZZLE_GREEN; - sv_temp.swizzle_b = PIPE_SWIZZLE_BLUE; - sv_temp.swizzle_a = PIPE_SWIZZLE_ALPHA; + sv_temp.swizzle_r = PIPE_SWIZZLE_X; + sv_temp.swizzle_g = PIPE_SWIZZLE_Y; + sv_temp.swizzle_b = PIPE_SWIZZLE_Z; + sv_temp.swizzle_a = PIPE_SWIZZLE_W; sv = info->ctx->create_sampler_view(info->ctx, texture, &sv_temp); |