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

wined3d: Formalize requirements for layout qualifiers. 

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-20 11:04:10 +02:00 committed by Alexandre Julliard
parent 9b00f0182b
commit d5b9271e82
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wined3d/glsl_shader.c
View File

@ -557,6 +557,14 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro
print_glsl_info_log(gl_info, program, TRUE); print_glsl_info_log(gl_info, program, TRUE);
} }
static BOOL shader_glsl_use_layout_qualifier(const struct wined3d_gl_info *gl_info)
{
/* Layout qualifiers were introduced in GLSL 1.40. The Nvidia Legacy GPU
* driver (series 340.xx) doesn't parse layout qualifiers in older GLSL
* versions. */
return shader_glsl_get_version(gl_info) >= 140;
}
static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info) static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info)
{ {
return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]; return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK];
@ -2021,7 +2029,8 @@ static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info)
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)
{ {
return !needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]; return gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]
&& shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info);
} }
static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info)