diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-04-16 14:05:47 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-04-22 01:30:39 +0200 |
| commit | fb523cb6ad3ffef22ab4b9cce9e53859c17c5739 (patch) | |
| tree | 45b67da368c4c387329e5887ab6d49d61f0b85a9 /src/gallium/state_trackers/xvmc | |
| parent | ed23335a313dfc9cec26999c0adffe3ab3a73a58 (diff) | |
| download | external_mesa3d-fb523cb6ad3ffef22ab4b9cce9e53859c17c5739.zip external_mesa3d-fb523cb6ad3ffef22ab4b9cce9e53859c17c5739.tar.gz external_mesa3d-fb523cb6ad3ffef22ab4b9cce9e53859c17c5739.tar.bz2 | |
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 <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/state_trackers/xvmc')
| -rw-r--r-- | src/gallium/state_trackers/xvmc/subpicture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c index 6f42216..8b95a4e 100644 --- a/src/gallium/state_trackers/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xvmc/subpicture.c @@ -276,7 +276,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture * memset(&sampler_templ, 0, sizeof(sampler_templ)); u_sampler_view_default_template(&sampler_templ, tex, tex->format); - sampler_templ.swizzle_a = PIPE_SWIZZLE_ONE; + sampler_templ.swizzle_a = PIPE_SWIZZLE_1; subpicture_priv->palette = pipe->create_sampler_view(pipe, tex, &sampler_templ); pipe_resource_reference(&tex, NULL); if (!subpicture_priv->sampler) { |