Skip to content

W
wine-winehq
Commit 6fe1a5da authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

wined3d: Don't use TMP_COLOR unless srgb is enabled.

This was needed unconditionally in the past to apply fog, but since we're using the ARBfp fog defines it is only needed if an sRGB correction is done at the end of the shader.
parent b8aa4e4f
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 4 deletions
dlls/wined3d/arb_program_shader.c
View file @ 6fe1a5da
......@@ -543,7 +543,14 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface,
case WINED3DSPR_COLOROUT:
if (reg->idx == 0)
{
strcpy(register_name, "TMP_COLOR");
if(((IWineD3DPixelShaderImpl *)This)->cur_args->srgb_correction)
{
strcpy(register_name, "TMP_COLOR");
}
else
{
strcpy(register_name, "result.color");
}
}
else
{
......@@ -1930,8 +1937,12 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface,
{
fragcolor = "R0";
} else {
shader_addline(buffer, "TEMP TMP_COLOR;\n");
fragcolor = "TMP_COLOR";
if(args->srgb_correction) {
shader_addline(buffer, "TEMP TMP_COLOR;\n");
fragcolor = "TMP_COLOR";
} else {
fragcolor = "result.color";
}
}
/* Base Declarations */
......@@ -1942,8 +1953,10 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface,
if(args->srgb_correction) {
arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TMP2", "TA", "TB");
shader_addline(buffer, "MOV result.color, %s;\n", fragcolor);
} else if(reg_maps->shader_version.major < 2) {
shader_addline(buffer, "MOV result.color, %s;\n", fragcolor);
}
shader_addline(buffer, "MOV result.color, %s;\n", fragcolor);
shader_addline(buffer, "END\n");
/* TODO: change to resource.glObjectHandle or something like that */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment