aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_format.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-28 08:33:39 +0100
committermarha <marha@users.sourceforge.net>2011-11-28 08:33:39 +0100
commit7417e9a171736b5279881cd4381fb58c617a23d9 (patch)
treef5eefdba22232ed7549497c96e70f09ccf558988 /mesalib/src/mesa/state_tracker/st_format.c
parenta0b4a1330be6a36ad095222d2ea83927cd33514d (diff)
downloadvcxsrv-7417e9a171736b5279881cd4381fb58c617a23d9.tar.gz
vcxsrv-7417e9a171736b5279881cd4381fb58c617a23d9.tar.bz2
vcxsrv-7417e9a171736b5279881cd4381fb58c617a23d9.zip
mesa git update 28 nov 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_format.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_format.c8
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: