wined3d: Only apply float R16G16F/R32G32F fixup when ARB_texture_rg isn't around…

wined3d: Only apply float R16G16F/R32G32F fixup when ARB_texture_rg isn't around and remove redundant code.

wined3d: Only apply float R16G16F/R32G32F fixup when ARB_texture_rg isn't around…
2c5eee25 · Roderick Colenbrander · Alexandre Julliard · edcdbc2a · 2c5eee25
Commit 2c5eee25 authored Apr 07, 2010 by Roderick Colenbrander Committed by Alexandre Julliard Apr 07, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

surface.c dlls/wined3d/surface.c +2 -4

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2286,16 +2286,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
            break;

        case WINED3DFMT_R16G16_FLOAT:
+            if (gl_info->supported[ARB_TEXTURE_RG]) break;
            *convert = CONVERT_R16G16F;
-            *format = GL_RGB;
-            *type = GL_HALF_FLOAT_ARB;
            *target_bpp = 6;
            break;

        case WINED3DFMT_R32G32_FLOAT:
+            if (gl_info->supported[ARB_TEXTURE_RG]) break;
            *convert = CONVERT_R32G32F;
-            *format = GL_RGB;
-            *type = GL_FLOAT;
            *target_bpp = 12;
            break;