=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Use GLSL 4.40 if available.
Alexandre Julliard
julliard at winehq.org
Wed Oct 18 15:16:28 CDT 2017
Module: wine
Branch: master
Commit: 5deb1a20c3b040658e4da456877371ecc391d5ca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5deb1a20c3b040658e4da456877371ecc391d5ca
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Oct 18 00:25:06 2017 +0200
wined3d: Use GLSL 4.40 if available.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/glsl_shader.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ba89ea1..45a7b98 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -386,7 +386,9 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type)
static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info)
{
- if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50))
+ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 40))
+ return 440;
+ else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50))
return 150;
else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))
return 130;
More information about the wine-cvs
mailing list