Matteo Bruni : wined3d: Use GLSL 1.50 on core contexts.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jul 9 09:44:36 CDT 2015
Module: wine
Branch: master
Commit: 4c0b1a5038090555b09e26caa02e8f9b64f5e745
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0b1a5038090555b09e26caa02e8f9b64f5e745
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Wed Jul 8 15:47:02 2015 +0200
wined3d: Use GLSL 1.50 on core contexts.
---
dlls/wined3d/glsl_shader.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 2770ab9..3c92781 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -297,7 +297,9 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type)
static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info,
const struct wined3d_shader_version *version)
{
- if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version->major >= 4)
+ if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])
+ return "#version 150";
+ else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4)
return "#version 130";
else
return "#version 120";
@@ -5594,8 +5596,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe
string_buffer_clear(buffer);
- shader_addline(buffer, "#version 120\n");
- shader_addline(buffer, "\n");
+ shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL));
for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i)
{
@@ -6112,7 +6113,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *
}
lowest_disabled_stage = stage;
- shader_addline(buffer, "#version 120\n");
+ shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL));
if (gl_info->supported[ARB_TEXTURE_RECTANGLE])
shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n");
More information about the wine-cvs
mailing list