Mesa (master): gallium: merge PIPE_SWIZZLE_* and UTIL_FORMAT_SWIZZLE_*

[Marek Olšák]

Module: Mesa
Branch: master
Commit: fb523cb6ad3ffef22ab4b9cce9e53859c17c5739
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb523cb6ad3ffef22ab4b9cce9e53859c17c5739

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Apr 16 14:05:47 2016 +0200

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 at vmware.com>

---

 src/gallium/auxiliary/gallivm/lp_bld_format_aos.c  |  10 +-
 src/gallium/auxiliary/gallivm/lp_bld_format_soa.c  |   8 +-
 src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c |   2 +-
 src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c  |   8 +-
 src/gallium/auxiliary/gallivm/lp_bld_swizzle.c     |  46 ++++-----
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c    |  16 +--
 src/gallium/auxiliary/translate/translate_sse.c    | 110 ++++++++++-----------
 src/gallium/auxiliary/util/u_blitter.c             |   8 +-
 src/gallium/auxiliary/util/u_format.c              |  74 +++++++-------
 src/gallium/auxiliary/util/u_format.h              |  30 ++----
 src/gallium/auxiliary/util/u_format_table.py       |  14 +--
 src/gallium/auxiliary/util/u_sampler.c             |  18 ++--
 src/gallium/auxiliary/vl/vl_mpeg12_decoder.c       |   2 +-
 src/gallium/auxiliary/vl/vl_video_buffer.c         |   6 +-
 src/gallium/drivers/freedreno/a2xx/fd2_gmem.c      |   4 +-
 src/gallium/drivers/freedreno/a2xx/fd2_util.c      |  16 +--
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c      |   4 +-
 src/gallium/drivers/freedreno/a3xx/fd3_format.c    |  12 +--
 src/gallium/drivers/freedreno/a4xx/fd4_emit.c      |   4 +-
 src/gallium/drivers/freedreno/a4xx/fd4_format.c    |  12 +--
 src/gallium/drivers/i915/i915_state_sampler.c      |  32 +++---
 src/gallium/drivers/ilo/ilo_shader.c               |  32 +++---
 src/gallium/drivers/ilo/shader/ilo_shader_fs.c     |  12 +--
 src/gallium/drivers/ilo/shader/ilo_shader_vs.c     |  12 +--
 src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c    |   8 +-
 src/gallium/drivers/llvmpipe/lp_bld_depth.c        |   8 +-
 src/gallium/drivers/llvmpipe/lp_screen.c           |   2 +-
 src/gallium/drivers/llvmpipe/lp_state_fs.c         |   2 +-
 src/gallium/drivers/llvmpipe/lp_state_setup.c      |   4 +-
 src/gallium/drivers/nouveau/nouveau_video.c        |   6 +-
 src/gallium/drivers/nouveau/nouveau_vp3_video.c    |   4 +-
 src/gallium/drivers/nouveau/nv30/nv30_texture.c    |   2 +-
 src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c   |   8 +-
 src/gallium/drivers/nouveau/nv50/nv50_surface.c    |   8 +-
 src/gallium/drivers/nouveau/nv50/nv50_tex.c        |  12 +--
 src/gallium/drivers/nouveau/nv50/nv84_video.c      |   4 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c    |   8 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_tex.c        |  12 +--
 src/gallium/drivers/r300/r300_context.h            |   2 +-
 src/gallium/drivers/r300/r300_state_derived.c      |   4 +-
 src/gallium/drivers/r300/r300_texture.c            |  12 +--
 src/gallium/drivers/r600/evergreen_state.c         |   2 +-
 src/gallium/drivers/r600/r600_state_common.c       |  12 +--
 src/gallium/drivers/radeon/r600_texture.c          |  14 +--
 src/gallium/drivers/radeonsi/si_state.c            |  22 ++---
 src/gallium/drivers/softpipe/sp_tex_sample.c       |  30 +++---
 src/gallium/drivers/svga/svga_tgsi_insn.c          |  22 ++---
 src/gallium/drivers/svga/svga_tgsi_vgpu10.c        |  24 ++---
 src/gallium/drivers/vc4/vc4_formats.c              |   8 +-
 src/gallium/drivers/vc4/vc4_nir_lower_io.c         |   2 +-
 src/gallium/drivers/vc4/vc4_program.c              |  14 +--
 src/gallium/drivers/vc4/vc4_uniforms.c             |   8 +-
 src/gallium/include/pipe/p_defines.h               |  16 +--
 src/gallium/state_trackers/nine/basetexture9.c     |  36 +++----
 src/gallium/state_trackers/nine/device9.c          |   8 +-
 src/gallium/state_trackers/vdpau/device.c          |  24 ++---
 src/gallium/state_trackers/xvmc/subpicture.c       |   2 +-
 src/gallium/tests/graw/graw_util.h                 |   8 +-
 src/gallium/tests/graw/tex-srgb.c                  |  16 +--
 src/gallium/tests/graw/tex-swizzle.c               |  22 ++---
 src/mesa/state_tracker/st_cb_copyimage.c           |  32 +++---
 src/mesa/state_tracker/st_cb_drawpixels.c          |  16 +--
 src/mesa/state_tracker/st_cb_texture.c             |  52 +++++-----
 63 files changed, 489 insertions(+), 499 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=fb523cb6ad3ffef22ab4b9cce9e53859c17c5739