March 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Don' t update the bounds if any poly{line|gon} has fewer than two points.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 6e05189ba44d2e06bd49f4bced386a1e8d05a378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e05189ba44d2e06bd49f4bce… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 9 11:17:04 2016 +0000 gdi32: Don't update the bounds if any poly{line|gon} has fewer than two points. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 83f822a..d3b3325 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -484,28 +484,33 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po EMRPOLYPOLYLINE *emr; DWORD cptl = 0, poly, size, i; INT point; - RECTL bounds; + const RECTL empty = {0, 0, -1, -1}; + RECTL bounds = empty; const POINT *pts; - BOOL ret, use_small_emr = TRUE; - - bounds.left = bounds.right = pt[0].x; - bounds.top = bounds.bottom = pt[0].y; + BOOL ret, use_small_emr = TRUE, bounds_valid = TRUE; pts = pt; for(poly = 0; poly < polys; poly++) { cptl += counts[poly]; + if(counts[poly] < 2) bounds_valid = FALSE; for(point = 0; point < counts[poly]; point++) { /* check whether all points fit in the SHORT int POINT structure */ if( ((pts->x+0x8000) & ~0xffff ) || ((pts->y+0x8000) & ~0xffff ) ) use_small_emr = FALSE; - if(bounds.left > pts->x) bounds.left = pts->x; - else if(bounds.right < pts->x) bounds.right = pts->x; - if(bounds.top > pts->y) bounds.top = pts->y; - else if(bounds.bottom < pts->y) bounds.bottom = pts->y; + if(pts == pt) { + bounds.left = bounds.right = pts->x; + bounds.top = bounds.bottom = pts->y; + } else { + if(bounds.left > pts->x) bounds.left = pts->x; + else if(bounds.right < pts->x) bounds.right = pts->x; + if(bounds.top > pts->y) bounds.top = pts->y; + else if(bounds.bottom < pts->y) bounds.bottom = pts->y; + } pts++; } } + if(!cptl) bounds_valid = FALSE; size = FIELD_OFFSET(EMRPOLYPOLYLINE, aPolyCounts[polys]); if(use_small_emr) @@ -519,7 +524,10 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po if(use_small_emr) emr->emr.iType += EMR_POLYPOLYLINE16 - EMR_POLYPOLYLINE; emr->emr.nSize = size; - emr->rclBounds = bounds; + if(bounds_valid) + emr->rclBounds = bounds; + else + emr->rclBounds = empty; emr->nPolys = polys; emr->cptl = cptl; @@ -543,6 +551,11 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po } ret = EMFDRV_WriteRecord( dev, &emr->emr ); + if(ret && !bounds_valid) + { + ret = FALSE; + SetLastError( ERROR_INVALID_PARAMETER ); + } if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); HeapFree( GetProcessHeap(), 0, emr );

1 0

Huw Davies : gdi32/tests: Add tests for EMF PolyPolyline record creation.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: a36b4a6abbd0ea7847e44d386b35e646b015b3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36b4a6abbd0ea7847e44d386… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 9 11:17:05 2016 +0000 gdi32/tests: Add tests for EMF PolyPolyline record creation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a90c533..5b3bd9f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1371,6 +1371,59 @@ static const unsigned char EMF_BEZIER_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_POLYPOLYLINE_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x61, 0x01, 0x00, 0x00, 0xc2, 0x02, 0x00, 0x00, + 0x7a, 0xd4, 0x13, 0x00, 0xe8, 0x44, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x84, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xa1, 0x05, 0x00, 0x00, 0x47, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc1, 0x07, 0x00, + 0x2c, 0x84, 0x04, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x14, 0x00, + 0x5a, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x64, 0x00, 0xc8, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -3492,6 +3545,60 @@ static void test_emf_GetPath(void) DeleteEnhMetaFile(hemf); } +static void test_emf_PolyPolyline(void) +{ + HDC hdcMetafile; + HENHMETAFILE hemf; + POINT pts[4] = {{10, 20}, {100, 200}, {0x9000,300}, {400, 500}}; + DWORD counts[2]; + BOOL ret; + + SetLastError(0xdeadbeef); + hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + ret = PolyPolyline(hdcMetafile, NULL, NULL, 0); + ok( !ret, "PolyPolyline\n" ); + + SetLastError( 0xdeadbeef ); + counts[0] = 0; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + counts[0] = 1; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + counts[0] = 2; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + counts[0] = 2; + counts[1] = 2; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( ret, "PolyPolyline\n" ); + + hemf = CloseEnhMetaFile(hdcMetafile); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if(compare_emf_bits(hemf, EMF_POLYPOLYLINE_BITS, sizeof(EMF_POLYPOLYLINE_BITS), + "emf_PolyPolyline", FALSE) != 0) + { + dump_emf_bits(hemf, "emf_PolyPolyline"); + dump_emf_records(hemf, "emf_PolyPolyline"); + } + + DeleteEnhMetaFile(hemf); +} + START_TEST(metafile) { init_function_pointers(); @@ -3506,6 +3613,7 @@ START_TEST(metafile) test_emf_clipping(); test_emf_polybezier(); test_emf_GetPath(); + test_emf_PolyPolyline(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Józef Kucia : wined3d: Recognize aoffimmi shader instruction modifier.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 31713e39b528d98bb02d15624c4f827c44acdf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31713e39b528d98bb02d15624… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:50 2016 +0100 wined3d: Recognize aoffimmi shader instruction modifier. The aoffimmi stands for address offset by immediate integer. 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/shader.c | 3 +++ dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 11 +++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 88c064c..17611dd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2091,6 +2091,9 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } } + if (wined3d_shader_instruction_has_texel_offset(&ins)) + shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); + for (i = 0; i < ins.dst_count; ++i) { shader_dump_ins_modifiers(&buffer, &ins.dst[i]); diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 8c48d19..718effa 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -735,6 +735,7 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi ins->dst = &priv->dst_param; ins->src_count = opcode_info->param_count - opcode_info->dst_count; ins->src = priv->src_param; + memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; *ptr += shader_skip_opcode(priv, opcode_info, opcode_token); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a741f66..9cf74a5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -26,6 +26,14 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) +#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 +#define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 +#define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) +#define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 +#define WINED3D_SM4_AOFFIMMI_V_MASK (0xfu << WINED3D_SM4_AOFFIMMI_V_SHIFT) +#define WINED3D_SM4_AOFFIMMI_W_SHIFT 17 +#define WINED3D_SM4_AOFFIMMI_W_MASK (0xfu << WINED3D_SM4_AOFFIMMI_W_SHIFT) + #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) @@ -853,14 +861,40 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->dst = priv->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; + memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; *ptr += len; if (opcode_token & WINED3D_SM4_INSTRUCTION_MODIFIER) { + static const DWORD recognized_bits = WINED3D_SM4_MODIFIER_AOFFIMMI + | WINED3D_SM4_AOFFIMMI_U_MASK + | WINED3D_SM4_AOFFIMMI_V_MASK + | WINED3D_SM4_AOFFIMMI_W_MASK; DWORD modifier = *p++; - FIXME("Skipping modifier 0x%08x.\n", modifier); + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + + if (modifier & ~recognized_bits) + { + FIXME("Skipping modifier 0x%08x.\n", modifier); + } + else + { + aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } } if (opcode == WINED3D_SM4_OP_SHADER_DATA) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c2dc84..61cc3a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -801,6 +801,11 @@ struct wined3d_shader_register_semantic enum wined3d_sysval_semantic sysval_semantic; }; +struct wined3d_shader_texel_offset +{ + signed char u, v, w; +}; + struct wined3d_shader_instruction { const struct wined3d_shader_context *ctx; @@ -812,6 +817,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_dst_param *dst; UINT src_count; const struct wined3d_shader_src_param *src; + struct wined3d_shader_texel_offset texel_offset; union { struct wined3d_shader_semantic semantic; @@ -824,6 +830,11 @@ struct wined3d_shader_instruction } declaration; }; +static inline BOOL wined3d_shader_instruction_has_texel_offset(const struct wined3d_shader_instruction *ins) +{ + return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w; +} + struct wined3d_shader_attribute { enum wined3d_decl_usage usage;

1 0

Józef Kucia : wined3d: Extend shader_glsl_gen_sample_code() to support offsets.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: cd9b1812754126284bc319d155d4f20f947a5b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9b1812754126284bc319d15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:51 2016 +0100 wined3d: Extend shader_glsl_gen_sample_code() to support offsets. 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 | 121 ++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd9b1812754126284bc31…

1 0

Józef Kucia : wined3d: Implement aoffimmi modifier for SM4 ld instruction in GLSL backend.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 36c67c8a44e6fe7c2f5088e08e94cfbafcf697d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c67c8a44e6fe7c2f5088e08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:52 2016 +0100 wined3d: Implement aoffimmi modifier for SM4 ld instruction in GLSL backend. 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab4a511..732288a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4433,15 +4433,18 @@ static void shader_glsl_ld(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; + DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; - shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, WINED3D_GLSL_SAMPLE_LOAD, - &sample_function); + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; + + shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, 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[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param.param_str, NULL, "%s", coord_param.param_str); + NULL, NULL, lod_param.param_str, &ins->texel_offset, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Józef Kucia : wined3d: Implement aoffimmi modifier for SM4 sample instructions in GLSL backend.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: ab09deac3bb5e2ddaddba979d4945355ef360940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab09deac3bb5e2ddaddba979d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:53 2016 +0100 wined3d: Implement aoffimmi modifier for SM4 sample instructions in GLSL backend. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 732288a..85244c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4460,6 +4460,8 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) flags |= WINED3D_GLSL_SAMPLE_GRAD; if (ins->handler_idx == WINED3DSIH_SAMPLE_LOD) flags |= WINED3D_GLSL_SAMPLE_LOD; + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; @@ -4492,7 +4494,7 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) 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, - dx_param_str, dy_param_str, lod_param_str, NULL, "%s", coord_param.param_str); + dx_param_str, dy_param_str, lod_param_str, &ins->texel_offset, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Matteo Bruni : d3d11/tests: Require feature level 11_0 or 10_0 by default.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 9da6dd2ac93c97bc6f8cd60f26f20f632b8d8ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da6dd2ac93c97bc6f8cd60f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 8 23:19:41 2016 +0100 d3d11/tests: Require feature level 11_0 or 10_0 by default. Otherwise D3D11CreateDevice() might fallback to feature level 9 and the current tests can't handle (nor are interested in) that. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d9b2e4..9d6add5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -187,8 +187,23 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count; ID3D11Device *device; - UINT feature_level_count = feature_level ? 1 : 0; + + if (feature_level) + { + feature_level_count = 1; + } + else + { + feature_level = default_feature_level; + feature_level_count = sizeof(default_feature_level) / sizeof(default_feature_level[0]); + } if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL)))

1 0

Michael Stefaniuc : wined3d: Use SetRect() instead of open coding it.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: b3790bf8033e7f1ec507288fac2a2290e4053442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3790bf8033e7f1ec507288fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 8 11:52:22 2016 +0100 wined3d: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++------------ dlls/wined3d/surface.c | 5 +---- dlls/wined3d/swapchain.c | 6 ++---- dlls/wined3d/texture.c | 5 +---- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f094752..ff16c9d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3975,23 +3975,15 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - src_rect.left = src_box->left; - src_rect.top = src_box->top; - src_rect.right = src_box->right; - src_rect.bottom = src_box->bottom; + SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); } else { - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = src_surface->resource.width; - src_rect.bottom = src_surface->resource.height; + SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); } - dst_rect.left = dst_x; - dst_rect.top = dst_y; - dst_rect.right = dst_x + (src_rect.right - src_rect.left); - dst_rect.bottom = dst_y + (src_rect.bottom - src_rect.top); + SetRect(&dst_rect, dst_x, dst_y, dst_x + (src_rect.right - src_rect.left), + dst_y + (src_rect.bottom - src_rect.top)); if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) WARN("Failed to blit, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 814d4ab..c7545e0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1444,10 +1444,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P if (!src_rect) { - r.left = 0; - r.top = 0; - r.right = src_surface->resource.width; - r.bottom = src_surface->resource.height; + SetRect(&r, 0, 0, src_surface->resource.width, src_surface->resource.height); src_rect = &r; } else if (src_rect->left < 0 || src_rect->left >= src_rect->right diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 299a47a..9f3a36b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -545,10 +545,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT } else { - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = swapchain->desc.backbuffer_width; - src_rect.bottom = swapchain->desc.backbuffer_height; + SetRect(&src_rect, 0, 0, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height); } if (dst_rect_in) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 71ce472..3ac6f43 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -880,10 +880,7 @@ static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_reso struct wined3d_const_bo_address addr; RECT src_rect; - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = surface->resource.width; - src_rect.bottom = surface->resource.height; + SetRect(&src_rect, 0, 0, surface->resource.width, surface->resource.height); addr.buffer_object = 0; addr.addr = data->data;

1 0

Henri Verbeet : wined3d: Use D3DCOLORTOGLFLOAT4 in drawStridedSlow().
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 357e7b759fc4db6875f973ac7656ba85ed05965a URL: http://source.winehq.org/git/wine.git/?a=commit;h=357e7b759fc4db6875f973ac7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 15:51:11 2016 +0100 wined3d: Use D3DCOLORTOGLFLOAT4 in drawStridedSlow(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c95f92d..64b8012 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -291,15 +291,10 @@ static void drawStridedSlow(const struct wined3d_device *device, struct wined3d_ if (num_untracked_materials) { - DWORD diffuseColor = ((const DWORD *)ptrToCoords)[0]; unsigned char i; float color[4]; - color[0] = D3DCOLOR_B_R(diffuseColor) / 255.0f; - color[1] = D3DCOLOR_B_G(diffuseColor) / 255.0f; - color[2] = D3DCOLOR_B_B(diffuseColor) / 255.0f; - color[3] = D3DCOLOR_B_A(diffuseColor) / 255.0f; - + D3DCOLORTOGLFLOAT4(*(const DWORD *)ptrToCoords, color); for (i = 0; i < num_untracked_materials; ++i) { gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, context->untracked_materials[i], color);

1 0

Henri Verbeet : wined3d: Get rid of the D3DCOLOR_[RGBA] macros.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 09aa6acc0be418b3f1c097ff493923894ae6bfd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09aa6acc0be418b3f1c097ff4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 15:51:12 2016 +0100 wined3d: Get rid of the D3DCOLOR_[RGBA] macros. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 87c5f9b..3136a52 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -989,16 +989,11 @@ extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDD #define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xff) #define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xff) -#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xff)) / 255.0f) -#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xff)) / 255.0f) -#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xff)) / 255.0f) -#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xff)) / 255.0f) - #define D3DCOLORTOGLFLOAT4(dw, vec) do { \ - (vec)[0] = D3DCOLOR_R(dw); \ - (vec)[1] = D3DCOLOR_G(dw); \ - (vec)[2] = D3DCOLOR_B(dw); \ - (vec)[3] = D3DCOLOR_A(dw); \ + (vec)[0] = D3DCOLOR_B_R(dw) / 255.0f; \ + (vec)[1] = D3DCOLOR_B_G(dw) / 255.0f; \ + (vec)[2] = D3DCOLOR_B_B(dw) / 255.0f; \ + (vec)[3] = D3DCOLOR_B_A(dw) / 255.0f; \ } while(0) #define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */

1 0