diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-05 09:00:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-05 09:00:27 +0200 |
| commit | 51a003c23f4e27a826e56b0a3465d1e3e922d678 (patch) | |
| tree | 502470d9e5724764860fe16653b0f73a77fb6983 /mesalib/src/gallium/auxiliary/util/u_format.csv | |
| parent | bdc38022df44bde91e7ff95f6446cf20e19eaa5f (diff) | |
| parent | 324c1ed4069c7d49d0ff7c63261281148f9b6cd8 (diff) | |
| download | vcxsrv-51a003c23f4e27a826e56b0a3465d1e3e922d678.tar.gz vcxsrv-51a003c23f4e27a826e56b0a3465d1e3e922d678.tar.bz2 vcxsrv-51a003c23f4e27a826e56b0a3465d1e3e922d678.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_in.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
mesalib/src/mesa/swrast/s_context.c
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_format.csv')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format.csv | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.csv b/mesalib/src/gallium/auxiliary/util/u_format.csv index a3d2aae62..6c008cc71 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.csv +++ b/mesalib/src/gallium/auxiliary/util/u_format.csv @@ -265,5 +265,9 @@ PIPE_FORMAT_YV16 , other, 1, 1, x8 , x8 , x8 , x8 , xyzw, y PIPE_FORMAT_IYUV , other, 1, 1, x8 , x8 , x8 , x8 , xyzw, yuv PIPE_FORMAT_NV12 , other, 1, 1, x8 , x8 , x8 , x8 , xyzw, yuv PIPE_FORMAT_NV21 , other, 1, 1, x8 , x8 , x8 , x8 , xyzw, yuv -PIPE_FORMAT_IA44 , other, 1, 1, x8 , x8 , x8 , x8 , xyzw, yuv -PIPE_FORMAT_AI44 , 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_R8A8_UNORM , plain, 1, 1, un8 , un8 , , , x00y, rgb +PIPE_FORMAT_A8R8_UNORM , plain, 1, 1, un8 , un8 , , , y00x, rgb |