system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 22:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Rename texture_stage_op.color_correction to texture_stage_op.color_fixup.

Browse source 
This is consistent with other uses of struct color_fixup_desc.
This commit is contained in:
Henri Verbeet 2008-12-10 10:04:40 +01:00 committed by Alexandre Julliard
parent 4aeaba0d29
commit 4aa00e8a21
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/wined3d/arb_program_shader.c
View file

@ -2811,7 +2811,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi
sprintf(colorcor_dst, "tex%u", stage);
gen_color_correction(&buffer, colorcor_dst, WINED3DSP_WRITEMASK_ALL, "const.x", "const.y",
settings->op[stage].color_correction);
settings->op[stage].color_fixup);
}
/* Generate the main shader */

2
dlls/wined3d/ati_fragment_shader.c
View file

@ -351,7 +351,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con
if(op[stage].cop != WINED3DTOP_BUMPENVMAP &&
op[stage].cop != WINED3DTOP_BUMPENVMAPLUMINANCE) continue;
fixup = op[stage].color_correction;
fixup = op[stage].color_fixup;
if (fixup.x_source != CHANNEL_SOURCE_X || fixup.y_source != CHANNEL_SOURCE_Y)
{
FIXME("Swizzles not implemented\n");

6
dlls/wined3d/utils.c
View file

@ -1917,7 +1917,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
settings->op[i].aop = WINED3DTOP_DISABLE;
settings->op[i].carg0 = settings->op[i].carg1 = settings->op[i].carg2 = ARG_UNUSED;
settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = ARG_UNUSED;
settings->op[i].color_correction = COLOR_FIXUP_IDENTITY;
settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY;
settings->op[i].dst = resultreg;
settings->op[i].tex_type = tex_1d;
settings->op[i].projected = proj_none;
@ -1927,7 +1927,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
texture = (IWineD3DBaseTextureImpl *) stateblock->textures[i];
if(texture) {
settings->op[i].color_correction = texture->baseTexture.shader_color_fixup;
settings->op[i].color_fixup = texture->baseTexture.shader_color_fixup;
if(ignore_textype) {
settings->op[i].tex_type = tex_1d;
} else {
@ -1950,7 +1950,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
}
}
} else {
settings->op[i].color_correction = COLOR_FIXUP_IDENTITY;
settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY;
settings->op[i].tex_type = tex_1d;
}

2
dlls/wined3d/wined3d_private.h
View file

@ -935,7 +935,7 @@ struct texture_stage_op
unsigned aarg2 : 8;
unsigned aarg0 : 8;
struct color_fixup_desc color_correction;
struct color_fixup_desc color_fixup;
unsigned tex_type : 3;
unsigned dst : 1;
unsigned projected : 2;