Stefan Dösinger : wined3d: Flip WINED3DFMT_R8G8B8 to GL_RGB.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 1a82976908a3753baf10bf130b49ce60cb7d139f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1a82976908a3753baf10bf13...

Author: Stefan Dösinger 
Date:   Wed Jul  5 18:31:38 2006 +0200

wined3d: Flip WINED3DFMT_R8G8B8 to GL_RGB.

---

dlls/wined3d/surface.c |    2 +-
 dlls/wined3d/utils.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index e3c8682..b86dd7b 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -883,7 +883,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp
             case WINED3DFMT_R8G8B8:
                 {
                     glDrawPixels(This->lockedRect.right - This->lockedRect.left, (This->lockedRect.bottom - This->lockedRect.top)-1,
-                                 GL_RGB, GL_UNSIGNED_BYTE, This->resource.allocatedMemory);
+                                 GL_BGR, GL_UNSIGNED_BYTE, This->resource.allocatedMemory);
                     vcheckGLcall("glDrawPixels");
                 }
                 break;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 6a16729..a729344 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -60,7 +60,7 @@ static const PixelFormatDesc formats[] =
     {WINED3DFMT_A8P8        ,0x0000ff00 ,0x0        ,0x0        ,0x0        ,2      ,FALSE      ,0                      ,0                  ,0                              },
     {WINED3DFMT_P8          ,0x0        ,0x0        ,0x0        ,0x0        ,1      ,FALSE      ,GL_COLOR_INDEX8_EXT    ,GL_COLOR_INDEX     ,GL_UNSIGNED_BYTE               },
     /* Standard ARGB formats. Keep WINED3DFMT_R8G8B8(=20) at position 20 */
-    {WINED3DFMT_R8G8B8      ,0x0        ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,3      ,FALSE      ,GL_RGB8                ,GL_RGB             ,GL_UNSIGNED_BYTE               },
+    {WINED3DFMT_R8G8B8      ,0x0        ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,3      ,FALSE      ,GL_RGB8                ,GL_BGR             ,GL_UNSIGNED_BYTE               },
     {WINED3DFMT_A8R8G8B8    ,0xff000000 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,4      ,FALSE      ,GL_RGBA8               ,GL_BGRA            ,GL_UNSIGNED_INT_8_8_8_8_REV    },
     {WINED3DFMT_X8R8G8B8    ,0x0        ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,4      ,FALSE      ,GL_RGB8                ,GL_BGRA            ,GL_UNSIGNED_INT_8_8_8_8_REV    },
     {WINED3DFMT_R5G6B5      ,0x0        ,0x0000F800 ,0x000007e0 ,0x0000001f ,2      ,FALSE      ,GL_RGB5                ,GL_RGB             ,GL_UNSIGNED_SHORT_5_6_5        },