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/freedreno/a3xx/fd3_emit.c | |
| 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/drivers/freedreno/a3xx/fd3_emit.c')
| -rw-r--r-- | src/gallium/drivers/freedreno/a3xx/fd3_emit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c index adfa9a9..7d508e7 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c @@ -309,8 +309,8 @@ fd3_emit_gmem_restore_tex(struct fd_ringbuffer *ring, OUT_RING(ring, A3XX_TEX_CONST_0_FMT(fd3_pipe2tex(format)) | A3XX_TEX_CONST_0_TYPE(A3XX_TEX_2D) | - fd3_tex_swiz(format, PIPE_SWIZZLE_RED, PIPE_SWIZZLE_GREEN, - PIPE_SWIZZLE_BLUE, PIPE_SWIZZLE_ALPHA)); + fd3_tex_swiz(format, PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y, + PIPE_SWIZZLE_Z, PIPE_SWIZZLE_W)); OUT_RING(ring, A3XX_TEX_CONST_1_FETCHSIZE(TFETCH_DISABLE) | A3XX_TEX_CONST_1_WIDTH(psurf[i]->width) | A3XX_TEX_CONST_1_HEIGHT(psurf[i]->height)); |