diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-28 08:38:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-28 08:38:39 +0100 |
| commit | 22fb212bb84a69ab20a494aed1c197da1d2dbdf7 (patch) | |
| tree | d11c21c9260bee0f56c34ee6e241671befd5257f /mesalib/src/mesa/state_tracker | |
| parent | c1296df0ebe19a8e90fb7d7f0135d7034f16a76d (diff) | |
| parent | 7417e9a171736b5279881cd4381fb58c617a23d9 (diff) | |
| download | vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.gz vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.bz2 vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c index 196433d5e..b11245beb 100644 --- a/mesalib/src/mesa/state_tracker/st_format.c +++ b/mesalib/src/mesa/state_tracker/st_format.c @@ -162,6 +162,10 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat) return PIPE_FORMAT_B8G8R8A8_UNORM; case MESA_FORMAT_ARGB8888_REV: return PIPE_FORMAT_A8R8G8B8_UNORM; + case MESA_FORMAT_RGBX8888: + return PIPE_FORMAT_X8B8G8R8_UNORM; + case MESA_FORMAT_RGBX8888_REV: + return PIPE_FORMAT_R8G8B8X8_UNORM; case MESA_FORMAT_XRGB8888: return PIPE_FORMAT_B8G8R8X8_UNORM; case MESA_FORMAT_XRGB8888_REV: @@ -476,6 +480,10 @@ st_pipe_format_to_mesa_format(enum pipe_format format) return MESA_FORMAT_ARGB8888; case PIPE_FORMAT_A8R8G8B8_UNORM: return MESA_FORMAT_ARGB8888_REV; + case PIPE_FORMAT_X8B8G8R8_UNORM: + return MESA_FORMAT_RGBX8888; + case PIPE_FORMAT_R8G8B8X8_UNORM: + return MESA_FORMAT_RGBX8888_REV; case PIPE_FORMAT_B8G8R8X8_UNORM: return MESA_FORMAT_XRGB8888; case PIPE_FORMAT_X8R8G8B8_UNORM: |