diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /mesalib/src/mesa/main/formats.h | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'mesalib/src/mesa/main/formats.h')
| -rw-r--r-- | mesalib/src/mesa/main/formats.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h index b22b07338..3960f028e 100644 --- a/mesalib/src/mesa/main/formats.h +++ b/mesalib/src/mesa/main/formats.h @@ -91,8 +91,8 @@ typedef enum MESA_FORMAT_YCBCR, /* YYYY YYYY UorV UorV */ MESA_FORMAT_YCBCR_REV, /* UorV UorV YYYY YYYY */ MESA_FORMAT_R8, /* RRRR RRRR */ - MESA_FORMAT_RG88, /* GGGG GGGG RRRR RRRR */ - MESA_FORMAT_RG88_REV, /* RRRR RRRR GGGG GGGG */ + MESA_FORMAT_GR88, /* GGGG GGGG RRRR RRRR */ + MESA_FORMAT_RG88, /* RRRR RRRR GGGG GGGG */ MESA_FORMAT_R16, /* RRRR RRRR RRRR RRRR */ MESA_FORMAT_RG1616, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */ MESA_FORMAT_RG1616_REV, /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */ @@ -250,6 +250,8 @@ typedef enum MESA_FORMAT_SIGNED_LA_LATC2, /*@}*/ + MESA_FORMAT_ETC1_RGB8, + MESA_FORMAT_SIGNED_A8, /* AAAA AAAA */ MESA_FORMAT_SIGNED_L8, /* LLLL LLLL */ MESA_FORMAT_SIGNED_AL88, /* AAAA AAAA LLLL LLLL */ |