Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6f8cb77ea968ebd671fae17bddccf939b995bd3f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f8cb77ea968ebd671fae17bdd...

Author: Henri Verbeet 
Date:   Wed Oct  1 09:18:57 2014 +0200

wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8.

---

dlls/wined3d/surface.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 6672525..b24504e 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1638,9 +1638,9 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp
                 && texture == texture->swapchain->front_buffer)) || colorkey_active)
         {
             *conversion_type = WINED3D_CT_P8;
-            format->glInternal = GL_RGBA;
-            format->glFormat = GL_RGBA;
-            format->glType = GL_UNSIGNED_BYTE;
+            format->glInternal = GL_RGBA8;
+            format->glFormat = GL_BGRA;
+            format->glType = GL_UNSIGNED_INT_8_8_8_8_REV;
             format->conv_byte_count = 4;
         }
     }
@@ -3180,9 +3180,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI
                     for (x = 0; x < width; x++)
                     {
                         BYTE color = *source++;
-                        *dest++ = palette->colors[color].rgbRed;
-                        *dest++ = palette->colors[color].rgbGreen;
                         *dest++ = palette->colors[color].rgbBlue;
+                        *dest++ = palette->colors[color].rgbGreen;
+                        *dest++ = palette->colors[color].rgbRed;
                         *dest++ = 0;
                     }
                 }