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/drivers/nouveau/nv50/nv50_surface.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 <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/drivers/nouveau/nv50/nv50_surface.c')
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_surface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c index 68b0e18ef8f..a284f27c366 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c @@ -1122,10 +1122,10 @@ nv50_blit_set_src(struct nv50_blitctx *blit, templ.format = format; templ.u.tex.first_level = templ.u.tex.last_level = level; templ.u.tex.first_layer = templ.u.tex.last_layer = layer; - templ.swizzle_r = PIPE_SWIZZLE_RED; - templ.swizzle_g = PIPE_SWIZZLE_GREEN; - templ.swizzle_b = PIPE_SWIZZLE_BLUE; - templ.swizzle_a = PIPE_SWIZZLE_ALPHA; + templ.swizzle_r = PIPE_SWIZZLE_X; + templ.swizzle_g = PIPE_SWIZZLE_Y; + templ.swizzle_b = PIPE_SWIZZLE_Z; + templ.swizzle_a = PIPE_SWIZZLE_W; if (layer == -1) { templ.u.tex.first_layer = 0; |