Roderick Colenbrander : wined3d: Remove remaining redundant code from d3dfmt_get_conv.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1c02a909e59de60159ece427550f93f7aac47d0e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1c02a909e59de60159ece42755...

Author: Roderick Colenbrander <thunderbird2k(a)gmail.com>
Date:   Wed Apr  7 23:12:23 2010 +0200

wined3d: Remove remaining redundant code from d3dfmt_get_conv.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index bc44070..a82d52a 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2237,8 +2237,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
             } else {
                 /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */
                 *target_bpp = 2;
-                *format = GL_RGB;
-                *type = GL_UNSIGNED_SHORT_5_6_5;
             }
             break;
 
@@ -2253,9 +2251,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
                  * the needed type and format parameter, so the internal format contains a
                  * 4th component, which is returned as alpha
                  */
-            } else {
-                *format = GL_BGRA;
-                *type = GL_UNSIGNED_INT_8_8_8_8_REV;
             }
             break;