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

[Alexandre Julliard]

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

Author: Roderick Colenbrander <thunderbird2k(a)gmail.com>
Date:   Wed Apr  7 13:21:14 2010 +0200

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

---

 dlls/wined3d/surface.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index e880854..bc44070 100644
--- 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;