Józef Kucia : wined3d: Always use core profile GLSL versions.
Module: wine Branch: master Commit: 47b6e3d4e3f21b380620fadd3828ee9f4ece5b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b6e3d4e3f21b380620fadd38... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:29 2017 +0200 wined3d: Always use core profile GLSL versions. We should not be using any legacy/deprecated syntax anymore. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0f4e66c..4d585aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -365,11 +365,7 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { - unsigned int glsl_version = shader_glsl_get_version(gl_info); - if (glsl_version >= 150 && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - shader_addline(buffer, "#version %u compatibility\n", glsl_version); - else - shader_addline(buffer, "#version %u\n", glsl_version); + shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values)
participants (1)
-
Alexandre Julliard