diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-03-04 12:42:37 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2014-03-07 18:07:05 +0100 |
| commit | d8fde8ffede9bfc96b9f7071dd4e779540dba61d (patch) | |
| tree | 4d2271072c2bf32df7df8bb154b577497c920ac0 /src/gallium/auxiliary/util | |
| parent | 780ce576bb1781f027797039693b98253ee4813e (diff) | |
| download | external_mesa3d-d8fde8ffede9bfc96b9f7071dd4e779540dba61d.zip external_mesa3d-d8fde8ffede9bfc96b9f7071dd4e779540dba61d.tar.gz external_mesa3d-d8fde8ffede9bfc96b9f7071dd4e779540dba61d.tar.bz2 | |
gallium: rename R4A4 and A4R4 formats to match their swizzle
Like L4A4.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_format.csv | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_format.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/util/u_format.csv b/src/gallium/auxiliary/util/u_format.csv index 8d04b00..8fb068b 100644 --- a/src/gallium/auxiliary/util/u_format.csv +++ b/src/gallium/auxiliary/util/u_format.csv @@ -272,8 +272,8 @@ PIPE_FORMAT_NV12 , other, 1, 1, x8 , x8 , x8 , x8 , xyzw, y PIPE_FORMAT_NV21 , other, 1, 1, x8 , x8 , x8 , x8 , xyzw, yuv # Usually used to implement IA44 and AI44 formats in video decoding -PIPE_FORMAT_R4A4_UNORM , plain, 1, 1, un4 , un4 , , , y00x, rgb -PIPE_FORMAT_A4R4_UNORM , plain, 1, 1, un4 , un4 , , , x00y, rgb +PIPE_FORMAT_A4R4_UNORM , plain, 1, 1, un4 , un4 , , , y00x, rgb +PIPE_FORMAT_R4A4_UNORM , plain, 1, 1, un4 , un4 , , , x00y, rgb PIPE_FORMAT_R8A8_UNORM , plain, 1, 1, un8 , un8 , , , x00y, rgb PIPE_FORMAT_A8R8_UNORM , plain, 1, 1, un8 , un8 , , , y00x, rgb diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h index e36a9e2..747e142 100644 --- a/src/gallium/auxiliary/util/u_format.h +++ b/src/gallium/auxiliary/util/u_format.h @@ -1060,8 +1060,7 @@ util_format_luminance_to_red(enum pipe_format format) return PIPE_FORMAT_RGTC1_SNORM; case PIPE_FORMAT_L4A4_UNORM: - /* XXX A4R4 is defined as x00y in u_format.csv */ - return PIPE_FORMAT_A4R4_UNORM; + return PIPE_FORMAT_R4A4_UNORM; case PIPE_FORMAT_L8A8_UNORM: return PIPE_FORMAT_R8A8_UNORM; |