ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Roderick Colenbrander 2010-04-07 13:19:06 +02:00 committed by Alexandre Julliard
parent e7a71e15b5
commit edcdbc2a76
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wined3d/surface.c
View File

@ -2225,8 +2225,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
case WINED3DFMT_R8G8_SNORM: case WINED3DFMT_R8G8_SNORM:
if (gl_info->supported[NV_TEXTURE_SHADER]) break; if (gl_info->supported[NV_TEXTURE_SHADER]) break;
*convert = CONVERT_V8U8; *convert = CONVERT_V8U8;
*format = GL_BGR;
*type = GL_UNSIGNED_BYTE;
*target_bpp = 3; *target_bpp = 3;
break; break;
@ -2264,16 +2262,12 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
case WINED3DFMT_R8G8B8A8_SNORM: case WINED3DFMT_R8G8B8A8_SNORM:
if (gl_info->supported[NV_TEXTURE_SHADER]) break; if (gl_info->supported[NV_TEXTURE_SHADER]) break;
*convert = CONVERT_Q8W8V8U8; *convert = CONVERT_Q8W8V8U8;
*format = GL_BGRA;
*type = GL_UNSIGNED_BYTE;
*target_bpp = 4; *target_bpp = 4;
break; break;
case WINED3DFMT_R16G16_SNORM: case WINED3DFMT_R16G16_SNORM:
if (gl_info->supported[NV_TEXTURE_SHADER]) break; if (gl_info->supported[NV_TEXTURE_SHADER]) break;
*convert = CONVERT_V16U16; *convert = CONVERT_V16U16;
*format = GL_BGR;
*type = GL_UNSIGNED_SHORT;
*target_bpp = 6; *target_bpp = 6;
break; break;
@ -2283,15 +2277,11 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
* with A4L4 internal, but A8L8 format+type * with A4L4 internal, but A8L8 format+type
*/ */
*convert = CONVERT_A4L4; *convert = CONVERT_A4L4;
*format = GL_LUMINANCE_ALPHA;
*type = GL_UNSIGNED_BYTE;
*target_bpp = 2; *target_bpp = 2;
break; break;
case WINED3DFMT_R16G16_UNORM: case WINED3DFMT_R16G16_UNORM:
*convert = CONVERT_G16R16; *convert = CONVERT_G16R16;
*format = GL_RGB;
*type = GL_UNSIGNED_SHORT;
*target_bpp = 6; *target_bpp = 6;
break; break;