diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-29 12:25:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-29 12:25:28 +0100 |
| commit | 2cfebffb491807a465a8e5f7daca582d8aefb829 (patch) | |
| tree | 1e17cf480a441bc4b941008005fcd0cc6c3d09a6 /mesalib/src/mesa/state_tracker/st_format.c | |
| parent | 7417e9a171736b5279881cd4381fb58c617a23d9 (diff) | |
| download | vcxsrv-2cfebffb491807a465a8e5f7daca582d8aefb829.tar.gz vcxsrv-2cfebffb491807a465a8e5f7daca582d8aefb829.tar.bz2 vcxsrv-2cfebffb491807a465a8e5f7daca582d8aefb829.zip | |
mesa git update 29 nov 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_format.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c index b11245beb..bc414f442 100644 --- a/mesalib/src/mesa/state_tracker/st_format.c +++ b/mesalib/src/mesa/state_tracker/st_format.c @@ -457,7 +457,8 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat) return PIPE_FORMAT_R9G9B9E5_FLOAT; case MESA_FORMAT_R11_G11_B10_FLOAT: return PIPE_FORMAT_R11G11B10_FLOAT; - + case MESA_FORMAT_ARGB2101010_UINT: + return PIPE_FORMAT_B10G10R10A2_UINT; default: assert(0); return PIPE_FORMAT_NONE; @@ -782,6 +783,8 @@ st_pipe_format_to_mesa_format(enum pipe_format format) case PIPE_FORMAT_R11G11B10_FLOAT: return MESA_FORMAT_R11_G11_B10_FLOAT; + case PIPE_FORMAT_B10G10R10A2_UINT: + return MESA_FORMAT_ARGB2101010_UINT; default: assert(0); return MESA_FORMAT_NONE; @@ -1471,7 +1474,11 @@ static const struct format_mapping format_map[] = { { { GL_R11F_G11F_B10F, 0 }, { PIPE_FORMAT_R11G11B10_FLOAT, 0 } - } + }, + { + { GL_RGB10_A2UI, 0 }, + { PIPE_FORMAT_B10G10R10A2_UINT, 0 } + }, }; |