February 2016 - Wine-commits

Nikolay Sivov : dwrite: Invalidate layout on all cases of attribute change.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: fc4b4be528a35b211de570a7e4ba665c181f8584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b4be528a35b211de570a7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 23:14:38 2016 +0300 dwrite: Invalidate layout on all cases of attribute change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 1 + dlls/dwrite/tests/layout.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9cbbb38..7d647d8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2363,6 +2363,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo list_add_after(&outer->entry, &cur->entry); list_add_after(&cur->entry, &right->entry); + layout->recompute = RECOMPUTE_EVERYTHING; return S_OK; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index e1903db..acc7a8f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3467,10 +3467,9 @@ static void test_GetLineMetrics(void) hr = IDWriteTextLayout_GetLineMetrics(layout, metrics + 2, 2, &count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 2, "got %u\n", count); -todo_wine { ok(metrics[3].height > metrics[1].height, "got %f, old %f\n", metrics[3].height, metrics[1].height); ok(metrics[3].baseline > metrics[1].baseline, "got %f, old %f\n", metrics[3].baseline, metrics[1].baseline); -} + /* revert to original format */ hr = IDWriteTextLayout_SetFontSize(layout, 12.0f, range); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Implement SetFlowDirection() for layout.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: bac7e9c65eedcb7fe5ea65d823b67e52aceea5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac7e9c65eedcb7fe5ea65d82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 23:14:39 2016 +0300 dwrite: Implement SetFlowDirection() for layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7d647d8..8c611f9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -400,6 +400,16 @@ static inline HRESULT format_set_wordwrapping(struct dwrite_textformat_data *for return S_OK; } +static inline HRESULT format_set_flowdirection(struct dwrite_textformat_data *format, + DWRITE_FLOW_DIRECTION direction, BOOL *changed) +{ + if ((UINT32)direction > DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT) + return E_INVALIDARG; + if (changed) *changed = format->flow != direction; + format->flow = direction; + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -3685,8 +3695,19 @@ static HRESULT WINAPI dwritetextformat1_layout_SetReadingDirection(IDWriteTextFo static HRESULT WINAPI dwritetextformat1_layout_SetFlowDirection(IDWriteTextFormat1 *iface, DWRITE_FLOW_DIRECTION direction) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, direction); - return E_NOTIMPL; + BOOL changed; + HRESULT hr; + + TRACE("(%p)->(%d)\n", This, direction); + + hr = format_set_flowdirection(&This->format, direction, &changed); + if (FAILED(hr)) + return hr; + + if (changed) + This->recompute = RECOMPUTE_EVERYTHING; + + return S_OK; } static HRESULT WINAPI dwritetextformat1_layout_SetIncrementalTabStop(IDWriteTextFormat1 *iface, FLOAT tabstop) @@ -4675,14 +4696,8 @@ static HRESULT WINAPI dwritetextformat_SetReadingDirection(IDWriteTextFormat1 *i static HRESULT WINAPI dwritetextformat_SetFlowDirection(IDWriteTextFormat1 *iface, DWRITE_FLOW_DIRECTION direction) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - TRACE("(%p)->(%d)\n", This, direction); - - if ((UINT32)direction > DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT) - return E_INVALIDARG; - - This->format.flow = direction; - return S_OK; + return format_set_flowdirection(&This->format, direction, NULL); } static HRESULT WINAPI dwritetextformat_SetIncrementalTabStop(IDWriteTextFormat1 *iface, FLOAT tabstop)

1 0

Nikolay Sivov : dwrite: Implement SetLineSpacing() for layout.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: b2a0fbc158eb728f47ffb9ed0e48d2f52df0e80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a0fbc158eb728f47ffb9ed0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 23:14:40 2016 +0300 dwrite: Implement SetLineSpacing() for layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8c611f9..1d09460 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -410,6 +410,21 @@ static inline HRESULT format_set_flowdirection(struct dwrite_textformat_data *fo return S_OK; } +static inline HRESULT format_set_linespacing(struct dwrite_textformat_data *format, + DWRITE_LINE_SPACING_METHOD method, FLOAT spacing, FLOAT baseline, BOOL *changed) +{ + if (spacing < 0.0f || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM) + return E_INVALIDARG; + + if (changed) *changed = format->spacingmethod != method || + format->spacing != spacing || format->baseline != baseline; + + format->spacingmethod = method; + format->spacing = spacing; + format->baseline = baseline; + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -3725,12 +3740,23 @@ static HRESULT WINAPI dwritetextformat1_layout_SetTrimming(IDWriteTextFormat1 *i return E_NOTIMPL; } -static HRESULT WINAPI dwritetextformat1_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD spacing, - FLOAT line_spacing, FLOAT baseline) +static HRESULT WINAPI dwritetextformat1_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD method, + FLOAT spacing, FLOAT baseline) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d %f %f): stub\n", This, spacing, line_spacing, baseline); - return E_NOTIMPL; + BOOL changed; + HRESULT hr; + + TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline); + + hr = format_set_linespacing(&This->format, method, spacing, baseline, &changed); + if (FAILED(hr)) + return hr; + + if (changed) + This->recompute = RECOMPUTE_EVERYTHING; + + return S_OK; } static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat1_layout_GetTextAlignment(IDWriteTextFormat1 *iface) @@ -4726,16 +4752,8 @@ static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat1 *iface, FLOAT spacing, FLOAT baseline) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline); - - if (spacing < 0.0f || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM) - return E_INVALIDARG; - - This->format.spacingmethod = method; - This->format.spacing = spacing; - This->format.baseline = baseline; - return S_OK; + return format_set_linespacing(&This->format, method, spacing, baseline, NULL); } static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat_GetTextAlignment(IDWriteTextFormat1 *iface)

1 0

Józef Kucia : wined3d: Recognize SM4 sample_c opcode.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: 233dff7ca3f7501d035a6ec4508ba78890737dd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233dff7ca3f7501d035a6ec45… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:08 2016 +0100 wined3d: Recognize SM4 sample_c opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9c19600..54bd1a9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5316,6 +5316,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_B */ NULL, + /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa82196..0f2327f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8104,6 +8104,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_B */ NULL, + /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample_lod, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2ae6393..e81fc4e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -144,6 +144,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", /* WINED3DSIH_SAMPLE_B */ "sample_b", + /* WINED3DSIH_SAMPLE_C */ "sample_c", /* WINED3DSIH_SAMPLE_C_LZ */ "sample_c_lz", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ce1067f..2de7fc4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -147,6 +147,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ROUND_Z = 0x43, WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, + WINED3D_SM4_OP_SAMPLE_C = 0x46, WINED3D_SM4_OP_SAMPLE_C_LZ = 0x47, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, @@ -358,6 +359,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ROUND_Z, WINED3DSIH_ROUND_Z, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, "U", "FRS"}, + {WINED3D_SM4_OP_SAMPLE_C, WINED3DSIH_SAMPLE_C, "F", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_C_LZ, "F", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, "U", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_GRAD, WINED3DSIH_SAMPLE_GRAD, "U", "FRSFF"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 965b012..84a6dc1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -594,6 +594,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, WINED3DSIH_SAMPLE_B, + WINED3DSIH_SAMPLE_C, WINED3DSIH_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_LOD,

1 0

Józef Kucia : wined3d: Merge shader_glsl_sample() and shader_glsl_sample_lod().
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: a8f13e0aadfaaba43255b99404f9cd8e4ec6953b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f13e0aadfaaba43255b9940… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:09 2016 +0100 wined3d: Merge shader_glsl_sample() and shader_glsl_sample_lod(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0f2327f..00bd81e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4395,33 +4395,34 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) { + unsigned int resource_idx, sampler_idx, sampler_bind_idx; + struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; - struct glsl_src_param coord_param; - unsigned int sampler_bind_idx; + const char *lod_param_str = NULL; + DWORD flags = 0; - shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, 0, &sample_function); - shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); - sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, - ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, NULL, "%s", coord_param.param_str); - shader_glsl_release_sample_function(ins->ctx, &sample_function); -} + resource_idx = ins->src[1].reg.idx[0].offset; + sampler_idx = ins->src[2].reg.idx[0].offset; -static void shader_glsl_sample_lod(const struct wined3d_shader_instruction *ins) -{ - struct glsl_src_param coord_param, lod_param; - struct glsl_sample_function sample_function; - unsigned int sampler_bind_idx; + switch (ins->handler_idx) + { + case WINED3DSIH_SAMPLE: + break; + case WINED3DSIH_SAMPLE_LOD: + flags |= WINED3D_GLSL_SAMPLE_LOD; + shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); + lod_param_str = lod_param.param_str; + break; + default: + ERR("Unhandled opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); + break; + } - shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, - WINED3D_GLSL_SAMPLE_LOD, &sample_function); + shader_glsl_get_sample_function(ins->ctx, resource_idx, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); - shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); - sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, - ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); + sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); + NULL, NULL, lod_param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -8107,7 +8108,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, - /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample_lod, + /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, /* WINED3DSIH_SGN */ shader_glsl_sgn,

1 0

Józef Kucia : wined3d: Implement SM4 sample_b instruction.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: e116295dd7c8cfad55e490be7f31957eef718865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e116295dd7c8cfad55e490be7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:10 2016 +0100 wined3d: Implement SM4 sample_b instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 00bd81e..e9ec4f1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4408,6 +4408,10 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_SAMPLE: break; + case WINED3DSIH_SAMPLE_B: + shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); + lod_param_str = lod_param.param_str; + break; case WINED3DSIH_SAMPLE_LOD: flags |= WINED3D_GLSL_SAMPLE_LOD; shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); @@ -8104,7 +8108,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ROUND_Z */ shader_glsl_map2gl, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, - /* WINED3DSIH_SAMPLE_B */ NULL, + /* WINED3DSIH_SAMPLE_B */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL,

1 0

Józef Kucia : wined3d: Implement SM4 sample_d instruction.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: 9fff1694980484c69de1101167c3b180b264aa14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fff1694980484c69de110116… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:11 2016 +0100 wined3d: Implement SM4 sample_d instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e9ec4f1..1b82858 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4395,15 +4395,23 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) { + const char *lod_param_str = NULL, *dx_param_str = NULL, *dy_param_str = NULL; + struct glsl_src_param coord_param, lod_param, dx_param, dy_param; unsigned int resource_idx, sampler_idx, sampler_bind_idx; - struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; - const char *lod_param_str = NULL; DWORD flags = 0; + if (ins->handler_idx == WINED3DSIH_SAMPLE_GRAD) + flags |= WINED3D_GLSL_SAMPLE_GRAD; + if (ins->handler_idx == WINED3DSIH_SAMPLE_LOD) + flags |= WINED3D_GLSL_SAMPLE_LOD; + resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; + shader_glsl_get_sample_function(ins->ctx, resource_idx, flags, &sample_function); + shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); + switch (ins->handler_idx) { case WINED3DSIH_SAMPLE: @@ -4412,8 +4420,13 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); lod_param_str = lod_param.param_str; break; + case WINED3DSIH_SAMPLE_GRAD: + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[4], sample_function.coord_mask, &dy_param); + dx_param_str = dx_param.param_str; + dy_param_str = dy_param.param_str; + break; case WINED3DSIH_SAMPLE_LOD: - flags |= WINED3D_GLSL_SAMPLE_LOD; shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); lod_param_str = lod_param.param_str; break; @@ -4422,11 +4435,9 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) break; } - shader_glsl_get_sample_function(ins->ctx, resource_idx, flags, &sample_function); - shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param_str, "%s", coord_param.param_str); + dx_param_str, dy_param_str, lod_param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -8111,7 +8122,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_B */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, - /* WINED3DSIH_SAMPLE_GRAD */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare,

1 0

Henri Verbeet : ddraw: Use wined3d_resource_map() in surface_lock().
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: 36187987ed92f1e6662cfd739e0f67d7ff58a9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36187987ed92f1e6662cfd739… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 19:23:29 2016 +0100 ddraw: Use wined3d_resource_map() in surface_lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 57 +++++++++++++++++++++--------------------- dlls/wined3d/surface.c | 4 +-- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 -- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6a07cd7..edb9485 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -941,17 +941,17 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac * For more details, see IWineD3DSurface::LockRect * *****************************************************************************/ -static HRESULT surface_lock(struct ddraw_surface *This, - RECT *Rect, DDSURFACEDESC2 *DDSD, DWORD Flags, HANDLE h) +static HRESULT surface_lock(struct ddraw_surface *surface, + RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE h) { struct wined3d_box box; struct wined3d_map_desc map_desc; HRESULT hr = DD_OK; - TRACE("This %p, rect %s, surface_desc %p, flags %#x, h %p.\n", - This, wine_dbgstr_rect(Rect), DDSD, Flags, h); + TRACE("surface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", + surface, wine_dbgstr_rect(rect), surface_desc, flags, h); - /* This->surface_desc.dwWidth and dwHeight are changeable, thus lock */ + /* surface->surface_desc.dwWidth and dwHeight are changeable, thus lock */ wined3d_mutex_lock(); /* Should I check for the handle to be NULL? @@ -961,33 +961,31 @@ static HRESULT surface_lock(struct ddraw_surface *This, */ /* Windows zeroes this if the rect is invalid */ - DDSD->lpSurface = 0; + surface_desc->lpSurface = NULL; - if (Rect) + if (rect) { - if ((Rect->left < 0) - || (Rect->top < 0) - || (Rect->left > Rect->right) - || (Rect->top > Rect->bottom) - || (Rect->right > This->surface_desc.dwWidth) - || (Rect->bottom > This->surface_desc.dwHeight)) + if ((rect->left < 0) || (rect->top < 0) + || (rect->left > rect->right) || (rect->right > surface->surface_desc.dwWidth) + || (rect->top > rect->bottom) || (rect->bottom > surface->surface_desc.dwHeight)) { WARN("Trying to lock an invalid rectangle, returning DDERR_INVALIDPARAMS\n"); wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } - box.left = Rect->left; - box.top = Rect->top; - box.right = Rect->right; - box.bottom = Rect->bottom; + box.left = rect->left; + box.top = rect->top; + box.right = rect->right; + box.bottom = rect->bottom; box.front = 0; box.back = 1; } - if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(This, Rect, TRUE); + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_map(This->wined3d_surface, &map_desc, Rect ? &box : NULL, Flags); + hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), + surface->sub_resource_idx, &map_desc, rect ? &box : NULL, flags); if (FAILED(hr)) { wined3d_mutex_unlock(); @@ -1004,22 +1002,23 @@ static HRESULT surface_lock(struct ddraw_surface *This, } } - if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (Flags & DDLOCK_READONLY) - memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); - else if (Rect) - This->ddraw->primary_lock = *Rect; + if (flags & DDLOCK_READONLY) + memset(&surface->ddraw->primary_lock, 0, sizeof(surface->ddraw->primary_lock)); + else if (rect) + surface->ddraw->primary_lock = *rect; else - SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight); + SetRect(&surface->ddraw->primary_lock, 0, 0, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight); } /* Windows does not set DDSD_LPSURFACE on locked surfaces. */ - DD_STRUCT_COPY_BYSIZE(DDSD,&(This->surface_desc)); - DDSD->lpSurface = map_desc.data; + DD_STRUCT_COPY_BYSIZE(surface_desc, &surface->surface_desc); + surface_desc->lpSurface = map_desc.data; TRACE("locked surface returning description :\n"); - if (TRACE_ON(ddraw)) DDRAW_dump_surface_desc(DDSD); + if (TRACE_ON(ddraw)) + DDRAW_dump_surface_desc(surface_desc); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2698d09..657ef12 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2434,8 +2434,8 @@ HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) return WINED3D_OK; } -HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) +HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, + const struct wined3d_box *box, DWORD flags) { const struct wined3d_format *format = surface->resource.format; unsigned int fmt_flags = surface->container->resource.format_flags; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2698d17..6ff3151 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -226,7 +226,6 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_resource(ptr) -@ cdecl wined3d_surface_map(ptr ptr ptr long) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_unmap(ptr) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2dacd..94c7005 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2550,6 +2550,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, + const struct wined3d_box *box, DWORD flags) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 87f7532..04b022c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2479,8 +2479,6 @@ HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surfac void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect,

1 0

Henri Verbeet : ddraw: Use wined3d_resource_unmap() in ddraw_surface7_Unlock().
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: master Commit: 44f2589e7c239243b587e2d7ff92f4cdde61c3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f2589e7c239243b587e2d7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 19:23:30 2016 +0100 ddraw: Use wined3d_resource_unmap() in ddraw_surface7_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index edb9485..71b424d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1159,7 +1159,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface TRACE("iface %p, rect %s.\n", iface, wine_dbgstr_rect(pRect)); wined3d_mutex_lock(); - hr = wined3d_surface_unmap(surface->wined3d_surface); + hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); if (SUCCEEDED(hr) && surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 657ef12..a98f767 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2418,7 +2418,7 @@ do { \ return WINED3D_OK; } -HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) +HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6ff3151..6f930ef 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -227,7 +227,6 @@ @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) -@ cdecl wined3d_surface_unmap(ptr) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 94c7005..965b012 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2559,6 +2559,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; +HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 04b022c..f29f4ff 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2480,7 +2480,6 @@ void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface) DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); -HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx); HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface,

1 0

Alexandre Julliard : Wine release 1.8.1
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: website Branch: master Commit: 0bb4bb9c0bbba37fdca856e0a5487c62ce52297d URL: http://source.winehq.org/git/website.git/?a=commit;h=0bb4bb9c0bbba37fdca856… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 22:40:11 2016 +0900 Wine release 1.8.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016020301.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2016020301.xml b/news/en/2016020301.xml new file mode 100644 index 0000000..00efb2d --- /dev/null +++ b/news/en/2016020301.xml @@ -0,0 +1,13 @@ +<news> +<date>February 3, 2016</date> +<title>Wine 1.8.1 Released</title> +<body> + The Wine maintenance release 1.8.1 is now available. + <a href="{$root}/announce/1.8.1">What's new</a> in this release: +<ul> + <li>Various bug fixes.</li> + <li>Small translation updates.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0