xorg: Rename pipe formats.

diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 221ce772af9a79c7b9599b8814ce73bbe53e0804..000ec9048f59853faf63adf4e37d4b62616c03f1 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
@@ -205,7 +205,7 @@ crtc_load_cursor_argb_ga3d(xf86CrtcPtr crtc, CARD32 * image)
        templat.target = PIPE_TEXTURE_2D;
        templat.last_level = 0;
        templat.depth0 = 1;
-       templat.format = PIPE_FORMAT_A8R8G8B8_UNORM;
+       templat.format = PIPE_FORMAT_B8G8R8A8_UNORM;
        templat.width0 = 64;
        templat.height0 = 64;
 

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 5b6739243508947cb4f4883b4e1871b36a869218..5fc85c0e98cdfdba6bd30b74dba036f60e0551bf 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -116,12 +116,12 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer, unsigned int form
                   break;
                default:
                   template.format = ms->ds_depth_bits_last ?
-                                    PIPE_FORMAT_X8Z24_UNORM : PIPE_FORMAT_Z24X8_UNORM;
+                                    PIPE_FORMAT_Z24X8_UNORM : PIPE_FORMAT_X8Z24_UNORM;
                   break;
                }
             } else {
                template.format = ms->ds_depth_bits_last ?
-                                 PIPE_FORMAT_S8Z24_UNORM : PIPE_FORMAT_Z24S8_UNORM;
+                                 PIPE_FORMAT_Z24S8_UNORM : PIPE_FORMAT_S8Z24_UNORM;
             }
            template.width0 = pDraw->width;
            template.height0 = pDraw->height;
@@ -431,11 +431,11 @@ xorg_dri2_init(ScreenPtr pScreen)
     dri2info.Wait = NULL;
 
     ms->d_depth_bits_last =
-        ms->screen->is_format_supported(ms->screen, PIPE_FORMAT_X8Z24_UNORM,
+        ms->screen->is_format_supported(ms->screen, PIPE_FORMAT_Z24X8_UNORM,
                                         PIPE_TEXTURE_2D,
                                         PIPE_TEXTURE_USAGE_DEPTH_STENCIL, 0);
     ms->ds_depth_bits_last =
-        ms->screen->is_format_supported(ms->screen, PIPE_FORMAT_S8Z24_UNORM,
+        ms->screen->is_format_supported(ms->screen, PIPE_FORMAT_Z24S8_UNORM,
                                         PIPE_TEXTURE_2D,
                                         PIPE_TEXTURE_USAGE_DEPTH_STENCIL, 0);
 

diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index 665efdc0f0375b9b21897c908a08376b1d856121..a242e02ee7767e8583e8f42a17d23c20513c33a0 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -118,22 +118,22 @@ exa_get_pipe_format(int depth, enum pipe_format *format, int *bbp, int *picture_
 {
     switch (depth) {
     case 32:
-       *format = PIPE_FORMAT_A8R8G8B8_UNORM;
+       *format = PIPE_FORMAT_B8G8R8A8_UNORM;
        *picture_format = PICT_a8r8g8b8;
        assert(*bbp == 32);
        break;
     case 24:
-       *format = PIPE_FORMAT_X8R8G8B8_UNORM;
+       *format = PIPE_FORMAT_B8G8R8X8_UNORM;
        *picture_format = PICT_x8r8g8b8;
        assert(*bbp == 32);
        break;
     case 16:
-       *format = PIPE_FORMAT_R5G6B5_UNORM;
+       *format = PIPE_FORMAT_B5G6R5_UNORM;
        *picture_format = PICT_r5g6b5;
        assert(*bbp == 16);
        break;
     case 15:
-       *format = PIPE_FORMAT_A1R5G5B5_UNORM;
+       *format = PIPE_FORMAT_B5G5R5A1_UNORM;
        *picture_format = PICT_x1r5g5b5;
        assert(*bbp == 16);
        break;
@@ -144,7 +144,7 @@ exa_get_pipe_format(int depth, enum pipe_format *format, int *bbp, int *picture_
        break;
     case 4:
     case 1:
-       *format = PIPE_FORMAT_A8R8G8B8_UNORM; /* bad bad bad */
+       *format = PIPE_FORMAT_B8G8R8A8_UNORM; /* bad bad bad */
        break;
     default:
        assert(0);

diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c
index 0e39a390c69b2296110621566cb3e3d8c275b867..87d1dfaace29ab21b86918b6edd67ae4247f1a5c 100644 (file)
--- a/src/gallium/state_trackers/xorg/xvmc/surface.c
+++ b/src/gallium/state_trackers/xorg/xvmc/surface.c
@@ -101,7 +101,7 @@ CreateOrResizeBackBuffer(struct pipe_video_context *vpipe, unsigned int width, u
    memset(&template, 0, sizeof(struct pipe_texture));
    template.target = PIPE_TEXTURE_2D;
    /* XXX: Needs to match the drawable's format? */
-   template.format = PIPE_FORMAT_X8R8G8B8_UNORM;
+   template.format = PIPE_FORMAT_B8G8R8X8_UNORM;
    template.last_level = 0;
    template.width0 = width;
    template.height0 = height;