KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: rename R4A4 and A4R4 formats to match their swizzle 

Like L4A4.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2014-03-04 12:42:37 +01:00
parent 780ce576bb
commit d8fde8ffed
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/auxiliary/util/u_format.csv
View File

@ -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

Can't render this file because it contains an unexpected character in line 8 and column 3.

3
src/gallium/auxiliary/util/u_format.h
View File

@ -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;

2
src/gallium/drivers/ilo/ilo_format.c
View File

@ -504,8 +504,8 @@ ilo_translate_color_format(enum pipe_format format)
[PIPE_FORMAT_IYUV] = 0,
[PIPE_FORMAT_NV12] = 0,
[PIPE_FORMAT_NV21] = 0,
[PIPE_FORMAT_R4A4_UNORM] = 0,
[PIPE_FORMAT_A4R4_UNORM] = 0,
[PIPE_FORMAT_R4A4_UNORM] = 0,
[PIPE_FORMAT_R8A8_UNORM] = 0,
[PIPE_FORMAT_A8R8_UNORM] = 0,
[PIPE_FORMAT_R10G10B10A2_SSCALED] = BRW_SURFACEFORMAT_R10G10B10A2_SSCALED,

4
src/gallium/include/pipe/p_format.h
View File

@ -236,8 +236,8 @@ enum pipe_format {
PIPE_FORMAT_NV12 = 166,
PIPE_FORMAT_NV21 = 167,
PIPE_FORMAT_R4A4_UNORM = 168,
PIPE_FORMAT_A4R4_UNORM = 169,
PIPE_FORMAT_A4R4_UNORM = 168,
PIPE_FORMAT_R4A4_UNORM = 169,
PIPE_FORMAT_R8A8_UNORM = 170,
PIPE_FORMAT_A8R8_UNORM = 171,

4
src/gallium/state_trackers/vdpau/vdpau_private.h
View File

@ -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:

6
src/gallium/state_trackers/xvmc/subpicture.c
View File

@ -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';