Module: wine Branch: master Commit: f993a8e1c0a0bdfa1b686c66edc9214745843b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f993a8e1c0a0bdfa1b686c66ed...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu May 19 11:11:42 2016 +0200
wined3d: Load color key constants after switching to ARB fixed-function program.
This seems to be missing in f84d741cb3e639018e757d2f86c23117dca7d749.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/arb_program_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ef19ca4..89dece7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6683,7 +6683,8 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi * settings, then activate it. */ gen_ffp_frag_op(context, state, &settings, FALSE); desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); - if(!desc) { + if (!desc) + { struct arbfp_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc)); if (!new_desc) { @@ -6716,6 +6717,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi } state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); + color_key_arbfp(context, state, STATE_COLOR_KEY); } context->last_was_pshader = FALSE; }