diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-06 16:00:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-06 16:00:59 +0200 |
| commit | 788b9f4552ce114eb6d433bcb39e2de4acebef5d (patch) | |
| tree | c9c1dd2dfbddd353202e10dc5deb294bc6e528d1 /mesalib/src/gallium | |
| parent | aacd7c23fef5e89f26b4d23964ac8ebe93fd9cbe (diff) | |
| parent | 53da0b7e7c183ea15692234332b3e337b3fb0cc0 (diff) | |
| download | vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.tar.gz vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.tar.bz2 vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/GL3.txt
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mapi/glapi/glapi_mapi_tmp.h
mesalib/src/mapi/glapi/glapi_sparc.S
mesalib/src/mapi/glapi/glapi_x86-64.S
mesalib/src/mapi/glapi/glapi_x86.S
mesalib/src/mapi/glapi/glapitable.h
mesalib/src/mapi/glapi/glapitemp.h
mesalib/src/mapi/glapi/glprocs.h
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/enums.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/remap_helper.h
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/vbo/vbo_attrib_tmp.h
mesalib/src/mesa/vbo/vbo_save_api.c
Diffstat (limited to 'mesalib/src/gallium')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format.csv | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.csv b/mesalib/src/gallium/auxiliary/util/u_format.csv index 6c008cc71..621a46dba 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.csv +++ b/mesalib/src/gallium/auxiliary/util/u_format.csv @@ -146,7 +146,6 @@ PIPE_FORMAT_R8G8_B8G8_UNORM , subsampled, 2, 1, x32 , , , , xyz PIPE_FORMAT_G8R8_G8B8_UNORM , subsampled, 2, 1, x32 , , , , xyz1, rgb # some special formats not fitting anywhere else -PIPE_FORMAT_R10G10B10A2_USCALED , plain, 1, 1, u10 , u10 , u10 , u2 , xyzw, rgb PIPE_FORMAT_R11G11B10_FLOAT , other, 1, 1, x32 , , , , xyz1, rgb PIPE_FORMAT_R9G9B9E5_FLOAT , other, 1, 1, x32 , , , , xyz1, rgb PIPE_FORMAT_R1_UNORM , other, 8, 1, x8 , , , , x001, rgb @@ -271,3 +270,11 @@ PIPE_FORMAT_R4A4_UNORM , plain, 1, 1, un4 , un4 , , , y00x, r 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 + +# ARB_vertex_type_10_10_10_2_REV +PIPE_FORMAT_R10G10B10A2_USCALED , plain, 1, 1, u10, u10, u10, u2, xyzw, rgb +PIPE_FORMAT_R10G10B10A2_SSCALED , plain, 1, 1, s10, s10, s10, s2, xyzw, rgb +PIPE_FORMAT_R10G10B10A2_SNORM , plain, 1, 1, sn10, sn10, sn10, sn2, xyzw, rgb +PIPE_FORMAT_B10G10R10A2_USCALED , plain, 1, 1, u10, u10, u10, u2, zyxw, rgb +PIPE_FORMAT_B10G10R10A2_SSCALED , plain, 1, 1, s10, s10, s10, s2, zyxw, rgb +PIPE_FORMAT_B10G10R10A2_SNORM , plain, 1, 1, sn10, sn10, sn10, sn2, zyxw, rgb |