Module: wine Branch: master Commit: 4aa00e8a213a4ceb45f6df0af754066dc135813e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa00e8a213a4ceb45f6df0af7...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Dec 10 10:04:40 2008 +0100
wined3d: Rename texture_stage_op.color_correction to texture_stage_op.color_fixup.
This is consistent with other uses of struct color_fixup_desc.
---
dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5eb8539..1e7e51a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -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 */ diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index f88de9e..88dd0a5 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -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"); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fd4f4ee..0eb5337 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -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; }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 619baec..f8e2a8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -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;