Mesa (master): st/mesa: Fix nouveau glxinfo after merging texformat-rework.

[Brian Paul]

Module: Mesa
Branch: master
Commit: c2f5eb71485e0d4d717bad7ab94fdb4a75f7e38f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2f5eb71485e0d4d717bad7ab94fdb4a75f7e38f

Author: David Heidelberger <d.okias at gmail.com>
Date:   Thu Oct 29 09:54:31 2009 -0600

st/mesa: Fix nouveau glxinfo after merging texformat-rework.

Signed-off-by: David Heidelberger <d.okias at gmail.com>
Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/state_tracker/st_format.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 0be2737..7c6615f 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -218,6 +218,8 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
    case MESA_FORMAT_ARGB8888_REV:
    case MESA_FORMAT_ARGB8888:
       return PIPE_FORMAT_A8R8G8B8_UNORM;
+   case MESA_FORMAT_XRGB8888:
+      return PIPE_FORMAT_X8R8G8B8_UNORM;
    case MESA_FORMAT_ARGB1555:
       return PIPE_FORMAT_A1R5G5B5_UNORM;
    case MESA_FORMAT_ARGB4444:
@@ -287,6 +289,8 @@ st_pipe_format_to_mesa_format(enum pipe_format pipeFormat)
    switch (pipeFormat) {
    case PIPE_FORMAT_A8R8G8B8_UNORM:
       return MESA_FORMAT_ARGB8888;
+   case PIPE_FORMAT_X8R8G8B8_UNORM:
+      return MESA_FORMAT_XRGB8888;
    case PIPE_FORMAT_A1R5G5B5_UNORM:
       return MESA_FORMAT_ARGB1555;
    case PIPE_FORMAT_A4R4G4B4_UNORM:
@@ -698,6 +702,8 @@ translate_gallium_format_to_mesa_format(enum pipe_format format)
    switch (format) {
    case PIPE_FORMAT_A8R8G8B8_UNORM:
       return MESA_FORMAT_ARGB8888;
+   case PIPE_FORMAT_X8R8G8B8_UNORM:
+      return MESA_FORMAT_XRGB8888;
    case PIPE_FORMAT_A1R5G5B5_UNORM:
       return MESA_FORMAT_ARGB1555;
    case PIPE_FORMAT_A4R4G4B4_UNORM: