From 1c02a909e59de60159ece427550f93f7aac47d0e Mon Sep 17 00:00:00 2001 From: Roderick Colenbrander Date: Wed, 7 Apr 2010 23:12:23 +0200 Subject: [PATCH] wined3d: Remove remaining redundant code from d3dfmt_get_conv. --- dlls/wined3d/surface.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc44070bb52..a82d52adbaf 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;