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

wined3d: Don't output the fogcoord varying when not necessary. 

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Matteo Bruni 2015-10-15 22:01:03 +02:00 committed by Alexandre Julliard
parent 7837a0504c
commit 5b8be5550e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wined3d/glsl_shader.c
View File

@ -1827,7 +1827,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
shader_addline(buffer, "} ffp_point;\n"); shader_addline(buffer, "} ffp_point;\n");
} }
if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && version->major < 3)
{ {
declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n");
} }
@ -5234,12 +5234,15 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context
* the fog frag coord is thrown away. If the fog frag coord is used, but not written by * the fog frag coord is thrown away. If the fog frag coord is used, but not written by
* the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0)
*/ */
if (args->fog_src == VS_FOG_Z) if (reg_maps->shader_version.major < 3)
shader_addline(buffer, "%s = gl_Position.z;\n", {
legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); if (args->fog_src == VS_FOG_Z)
else if (!reg_maps->fog) shader_addline(buffer, "%s = gl_Position.z;\n",
shader_addline(buffer, "%s = 0.0;\n", legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord");
legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); else if (!reg_maps->fog)
shader_addline(buffer, "%s = 0.0;\n",
legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord");
}
/* We always store the clipplanes without y inversion */ /* We always store the clipplanes without y inversion */
if (args->clip_enabled) if (args->clip_enabled)