Skip to content

W
wine-winehq
Commit a830d780 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

wined3d: Use GLSL 1.30 for all shaders if available.

Signed-off-by: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 9ddc01e0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/wined3d/glsl_shader.c
View file @ a830d780
......@@ -357,7 +357,7 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf
if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]
|| (version && version->type == WINED3D_SHADER_TYPE_COMPUTE))
return 150;
else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4)
else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))
return 130;
else
return 120;
......@@ -2017,7 +2017,7 @@ static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_in
static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info)
{
return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT];
return gl_info->glsl_version < MAKEDWORD_VERSION(1, 30);
}
static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment