=?UTF-8?Q?Andrei=20Sl=C4=83voiu=20?=: wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don' t support EXT_GPU_SHADER4.

Alexandre Julliard julliard at winehq.org
Wed Jun 11 13:36:21 CDT 2014


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

Author: Andrei Slăvoiu <andrei.slavoiu at gmail.com>
Date:   Fri May 23 01:23:30 2014 +0300

wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4.

---

 dlls/wined3d/directx.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 224992d..d6bb3836 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1667,7 +1667,8 @@ static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info)
     if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM]
             && gl_info->supported[ARB_VERTEX_SHADER])
         level = 9;
-    if (level == 9 && gl_info->supported[EXT_GPU_SHADER4])
+    if (level == 9 && (gl_info->supported[EXT_GPU_SHADER4]
+	    || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)))
         level = 10;
 
     return level;




More information about the wine-cvs mailing list