Skip to content

W
wine-winehq
Commit edcdbc2a authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard
Browse files
Options

wined3d: Remove redundant gl format/type code from d3dfmt_get_conv since it is…

wined3d: Remove redundant gl format/type code from d3dfmt_get_conv since it is already in the table.
parent e7a71e15
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 10 deletions
dlls/wined3d/surface.c
View file @ edcdbc2a
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment