Module: wine Branch: master Commit: ae2aa2df59966e0aeb05980064b6392a8d1f18c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2aa2df59966e0aeb05980064...
Author: Matteo Bruni mbruni@codeweavers.com Date: Thu Sep 22 20:39:38 2016 +0200
wined3d: Update the Mesa d3d level detection hack.
Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/directx.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b019b6..a9a2922 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1737,16 +1737,13 @@ static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shad if (shader_caps->vs_version >= 5) return WINED3D_D3D_LEVEL_11; if (shader_caps->vs_version == 4) - { - /* No backed supports SM 5 at the moment */ - if (glsl_version >= MAKEDWORD_VERSION(4, 00)) - return WINED3D_D3D_LEVEL_11; return WINED3D_D3D_LEVEL_10; - } if (shader_caps->vs_version == 3) { - /* Wine cannot use SM 4 on mesa drivers as the necessary functionality - * is not exposed on compatibility contexts */ + /* wined3d with default settings at the moment doesn't expose SM4+ on + * Mesa drivers. */ + if (glsl_version >= MAKEDWORD_VERSION(4, 30)) + return WINED3D_D3D_LEVEL_11; if (glsl_version >= MAKEDWORD_VERSION(1, 30)) return WINED3D_D3D_LEVEL_10; return WINED3D_D3D_LEVEL_9_SM3;