Roderick Colenbrander : wined3d: Remove redundant gl format/ type code from d3dfmt_get_conv since it is already in the table.

[Alexandre Julliard]

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

Author: Roderick Colenbrander 
Date:   Wed Apr  7 13:19:06 2010 +0200

wined3d: Remove redundant gl format/type code from d3dfmt_get_conv since it is already in the table.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 79046f2..e880854 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2225,8 +2225,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
         case WINED3DFMT_R8G8_SNORM:
             if (gl_info->supported[NV_TEXTURE_SHADER]) break;
             *convert = CONVERT_V8U8;
-            *format = GL_BGR;
-            *type = GL_UNSIGNED_BYTE;
             *target_bpp = 3;
             break;

@@ -2264,16 +2262,12 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
         case WINED3DFMT_R8G8B8A8_SNORM:
             if (gl_info->supported[NV_TEXTURE_SHADER]) break;
             *convert = CONVERT_Q8W8V8U8;
-            *format = GL_BGRA;
-            *type = GL_UNSIGNED_BYTE;
             *target_bpp = 4;
             break;

case WINED3DFMT_R16G16_SNORM:
             if (gl_info->supported[NV_TEXTURE_SHADER]) break;
             *convert = CONVERT_V16U16;
-            *format = GL_BGR;
-            *type = GL_UNSIGNED_SHORT;
             *target_bpp = 6;
             break;

@@ -2283,15 +2277,11 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
              * with A4L4 internal, but A8L8 format+type
              */
             *convert = CONVERT_A4L4;
-            *format = GL_LUMINANCE_ALPHA;
-            *type = GL_UNSIGNED_BYTE;
             *target_bpp = 2;
             break;

case WINED3DFMT_R16G16_UNORM:
             *convert = CONVERT_G16R16;
-            *format = GL_RGB;
-            *type = GL_UNSIGNED_SHORT;
             *target_bpp = 6;
             break;