Henri Verbeet : wined3d: Don' t use floating point textures without ARB_texture_float.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 53baeddd67c018683c5f2e252c10dd51dfb7bcc7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=53baeddd67c018683c5f2e252c...

Author: Henri Verbeet 
Date:   Mon Nov  8 11:50:34 2010 +0100

wined3d: Don't use floating point textures without ARB_texture_float.

The floating point formats from ARB_texture_rg are only defined when
ARB_texture_float is also supported. It would have been nice if the formats
table itself was able to express this, but as far as I'm aware this is only an
issue for ARB_texture_rg, so it's probably not worth changing.
(cherry picked from commit 7a64870014b22f4c9ce1b2557f1ab18ef425f226)

---

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

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index b63a5f8..49a2659 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1136,6 +1136,12 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info)

if (!gl_info->supported[format_texture_info[i].extension]) continue;

+        /* ARB_texture_rg defines floating point formats, but only if
+         * ARB_texture_float is also supported. */
+        if (!gl_info->supported[ARB_TEXTURE_FLOAT]
+                && (desc->Flags & WINED3DFMT_FLAG_FLOAT))
+            continue;
+
         desc = &gl_info->gl_formats[fmt_idx];
         desc->glInternal = format_texture_info[i].gl_internal;
         desc->glGammaInternal = format_texture_info[i].gl_srgb_internal;