ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Use GLSL 1.30 for all shaders if available. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-04-12 12:42:28 +02:00 committed by Alexandre Julliard
parent 9ddc01e0c1
commit a830d7808f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/glsl_shader.c
View File

@ -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] if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]
|| (version && version->type == WINED3D_SHADER_TYPE_COMPUTE)) || (version && version->type == WINED3D_SHADER_TYPE_COMPUTE))
return 150; 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; return 130;
else else
return 120; 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) 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) static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info)