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/state_trackers | |
| 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/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/vdpau/vdpau_private.h | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xvmc/subpicture.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h index 078f0f9..ce6852b 100644 --- a/src/gallium/state_trackers/vdpau/vdpau_private.h +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h @@ -209,9 +209,9 @@ FormatIndexedToPipe(VdpRGBAFormat vdpau_format) { switch (vdpau_format) { case VDP_INDEXED_FORMAT_A4I4: - return PIPE_FORMAT_A4R4_UNORM; - case VDP_INDEXED_FORMAT_I4A4: return PIPE_FORMAT_R4A4_UNORM; + case VDP_INDEXED_FORMAT_I4A4: + return PIPE_FORMAT_A4R4_UNORM; case VDP_INDEXED_FORMAT_A8I8: return PIPE_FORMAT_A8R8_UNORM; case VDP_INDEXED_FORMAT_I8A8: diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c index 3497399..7a951fa 100644 --- a/src/gallium/state_trackers/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xvmc/subpicture.c @@ -55,10 +55,10 @@ static enum pipe_format XvIDToPipe(int xvimage_id) return PIPE_FORMAT_B8G8R8X8_UNORM; case FOURCC_AI44: - return PIPE_FORMAT_A4R4_UNORM; + return PIPE_FORMAT_R4A4_UNORM; case FOURCC_IA44: - return PIPE_FORMAT_R4A4_UNORM; + return PIPE_FORMAT_A4R4_UNORM; default: XVMC_MSG(XVMC_ERR, "[XvMC] Unrecognized Xv image ID 0x%08X.\n", xvimage_id); @@ -90,8 +90,8 @@ static int PipeToComponentOrder(enum pipe_format format, char *component_order) case PIPE_FORMAT_B8G8R8X8_UNORM: return 0; - case PIPE_FORMAT_R4A4_UNORM: case PIPE_FORMAT_A4R4_UNORM: + case PIPE_FORMAT_R4A4_UNORM: component_order[0] = 'Y'; component_order[1] = 'U'; component_order[2] = 'V'; |