July 2016 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Reduce the number of memory allocations required for gdi paths.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: da8834609a8b5e2d9aab1e7d843f5b311c9bc171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8834609a8b5e2d9aab1e7d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 14 14:28:14 2016 +0100 gdi32: Reduce the number of memory allocations required for gdi paths. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 62 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 2ee113e..558bcf7 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -89,6 +89,8 @@ struct gdi_path int allocated; BOOL newStroke; POINT pos; /* current cursor position */ + POINT points_buf[NUM_ENTRIES_INITIAL]; + BYTE flags_buf[NUM_ENTRIES_INITIAL]; }; struct path_physdev @@ -104,8 +106,8 @@ static inline struct path_physdev *get_path_physdev( PHYSDEV dev ) void free_gdi_path( struct gdi_path *path ) { - HeapFree( GetProcessHeap(), 0, path->points ); - HeapFree( GetProcessHeap(), 0, path->flags ); + if (path->points != path->points_buf) + HeapFree( GetProcessHeap(), 0, path->points ); HeapFree( GetProcessHeap(), 0, path ); } @@ -119,13 +121,22 @@ static struct gdi_path *alloc_gdi_path( int count ) return NULL; } count = max( NUM_ENTRIES_INITIAL, count ); - path->points = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*path->points) ); - path->flags = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*path->flags) ); - if (!path->points || !path->flags) + if (count > NUM_ENTRIES_INITIAL) { - free_gdi_path( path ); - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return NULL; + path->points = HeapAlloc( GetProcessHeap(), 0, + count * (sizeof(path->points[0]) + sizeof(path->flags[0])) ); + if (!path->points) + { + HeapFree( GetProcessHeap(), 0, path ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } + path->flags = (BYTE *)(path->points + count); + } + else + { + path->points = path->points_buf; + path->flags = path->flags_buf; } path->count = 0; path->allocated = count; @@ -179,30 +190,39 @@ static inline INT int_from_fixed(FIXED f) * been allocated; allocates larger arrays and copies the existing entries * to those arrays, if necessary. Returns TRUE if successful, else FALSE. */ -static BOOL PATH_ReserveEntries(struct gdi_path *pPath, INT count) +static BOOL PATH_ReserveEntries(struct gdi_path *path, INT count) { - POINT *pPointsNew; - BYTE *pFlagsNew; + POINT *pts_new; + int size; assert(count>=0); /* Do we have to allocate more memory? */ - if(count > pPath->allocated) + if (count > path->allocated) { /* Find number of entries to allocate. We let the size of the array * grow exponentially, since that will guarantee linear time * complexity. */ - count = max( pPath->allocated * 2, count ); - - pPointsNew = HeapReAlloc( GetProcessHeap(), 0, pPath->points, count * sizeof(POINT) ); - if (!pPointsNew) return FALSE; - pPath->points = pPointsNew; + count = max( path->allocated * 2, count ); + size = count * (sizeof(path->points[0]) + sizeof(path->flags[0])); - pFlagsNew = HeapReAlloc( GetProcessHeap(), 0, pPath->flags, count * sizeof(BYTE) ); - if (!pFlagsNew) return FALSE; - pPath->flags = pFlagsNew; + if (path->points == path->points_buf) + { + pts_new = HeapAlloc( GetProcessHeap(), 0, size ); + if (!pts_new) return FALSE; + memcpy( pts_new, path->points, path->count * sizeof(path->points[0]) ); + memcpy( pts_new + count, path->flags, path->count * sizeof(path->flags[0]) ); + } + else + { + pts_new = HeapReAlloc( GetProcessHeap(), 0, path->points, size ); + if (!pts_new) return FALSE; + memmove( pts_new + count, pts_new + path->allocated, path->count * sizeof(path->flags[0]) ); + } - pPath->allocated = count; + path->points = pts_new; + path->flags = (BYTE *)(pts_new + count); + path->allocated = count; } return TRUE; }

1 0

Huw Davies : gdi32: Change get_gdi_flat_path() to return an opaque path pointer.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 54ec86021a7d2b8ef3eb7ce6967797709834c260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ec86021a7d2b8ef3eb7ce69… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 14 14:28:13 2016 +0100 gdi32: Change get_gdi_flat_path() to return an opaque path pointer. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 9 ++++----- dlls/gdi32/enhmfdrv/graphics.c | 11 +++++------ dlls/gdi32/gdi_private.h | 3 ++- dlls/gdi32/path.c | 25 ++++++++++++------------- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index bfb3451..64f6d15 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -405,6 +405,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /* helper for path stroking and filling functions */ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) { + struct gdi_path *path; POINT *points; BYTE *types; BOOL ret = TRUE; @@ -413,9 +414,8 @@ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) if (dev->brush.style == BS_NULL) fill = FALSE; - total = get_gdi_flat_path( dev->dev.hdc, &points, &types, fill ? &interior : NULL ); - if (total == -1) return FALSE; - if (!total) goto done; + if (!(path = get_gdi_flat_path( dev->dev.hdc, fill ? &interior : NULL ))) return FALSE; + if (!(total = get_gdi_path_data( path, &points, &types ))) goto done; if (stroke && dev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); @@ -464,8 +464,7 @@ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) } done: - HeapFree( GetProcessHeap(), 0, points ); - HeapFree( GetProcessHeap(), 0, types ); + free_gdi_path( path ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 1dd345c..f74e86b 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -100,24 +100,23 @@ static void get_points_bounds( RECTL *bounds, const POINT *pts, UINT count, HDC static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) { EMRSTROKEANDFILLPATH emr; - int count; + struct gdi_path *path; POINT *points; BYTE *flags; emr.emr.iType = type; emr.emr.nSize = sizeof(emr); - count = get_gdi_flat_path( dev->hdc, &points, &flags, NULL ); - if (count >= 0) + if ((path = get_gdi_flat_path( dev->hdc, NULL ))) { + int count = get_gdi_path_data( path, &points, &flags ); get_points_bounds( &emr.rclBounds, points, count, 0 ); - HeapFree( GetProcessHeap(), 0, points ); - HeapFree( GetProcessHeap(), 0, flags ); + free_gdi_path( path ); } else emr.rclBounds = empty_bounds; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - if (count < 0) return FALSE; + if (!path) return FALSE; EMFDRV_UpdateBBox( dev, &emr.rclBounds ); return TRUE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8bdf9f1..b476864 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -337,7 +337,8 @@ typedef struct /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; -extern int get_gdi_flat_path( HDC hdc, POINT **points, BYTE **flags, HRGN *rgn ) DECLSPEC_HIDDEN; +extern struct gdi_path *get_gdi_flat_path( HDC hdc, HRGN *rgn ) DECLSPEC_HIDDEN; +extern int get_gdi_path_data( struct gdi_path *path, POINT **points, BYTE **flags ) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 86c1699..2ee113e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -514,29 +514,22 @@ static BOOL PATH_DoArcPart(struct gdi_path *pPath, FLOAT_POINT corners[], } /* retrieve a flattened path in device coordinates, and optionally its region */ -/* the DC path is deleted; the returned data must be freed by caller */ +/* the DC path is deleted; the returned data must be freed by caller using free_gdi_path() */ /* helper for stroke_and_fill_path in the DIB driver */ -int get_gdi_flat_path( HDC hdc, POINT **points, BYTE **flags, HRGN *rgn ) +struct gdi_path *get_gdi_flat_path( HDC hdc, HRGN *rgn ) { DC *dc = get_dc_ptr( hdc ); - int ret = -1; + struct gdi_path *ret = NULL; - if (!dc) return -1; + if (!dc) return NULL; if (dc->path) { - struct gdi_path *path = PATH_FlattenPath( dc->path ); + ret = PATH_FlattenPath( dc->path ); free_gdi_path( dc->path ); dc->path = NULL; - if (path) - { - ret = path->count; - *points = path->points; - *flags = path->flags; - if (rgn) *rgn = path_to_region( path, GetPolyFillMode( hdc )); - HeapFree( GetProcessHeap(), 0, path ); - } + if (ret && rgn) *rgn = path_to_region( ret, GetPolyFillMode( hdc ) ); } else SetLastError( ERROR_CAN_NOT_COMPLETE ); @@ -544,6 +537,12 @@ int get_gdi_flat_path( HDC hdc, POINT **points, BYTE **flags, HRGN *rgn ) return ret; } +int get_gdi_path_data( struct gdi_path *path, POINT **pts, BYTE **flags ) +{ + *pts = path->points; + *flags = path->flags; + return path->count; +} /*********************************************************************** * BeginPath (GDI32.@)

1 0

Huw Davies : gdi32: Use alloc_gdi_path() to create the path.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 23751e0ac23eefb032fc0ac71d4dbdb78bacb6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23751e0ac23eefb032fc0ac71… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 14 14:28:12 2016 +0100 gdi32: Use alloc_gdi_path() to create the path. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 34d717f..86c1699 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -136,24 +136,13 @@ static struct gdi_path *alloc_gdi_path( int count ) static struct gdi_path *copy_gdi_path( const struct gdi_path *src_path ) { - struct gdi_path *path = HeapAlloc( GetProcessHeap(), 0, sizeof(*path) ); + struct gdi_path *path = alloc_gdi_path( src_path->count ); - if (!path) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return NULL; - } - path->count = path->allocated = src_path->count; + if (!path) return NULL; + + path->count = src_path->count; path->newStroke = src_path->newStroke; path->pos = src_path->pos; - path->points = HeapAlloc( GetProcessHeap(), 0, path->count * sizeof(*path->points) ); - path->flags = HeapAlloc( GetProcessHeap(), 0, path->count * sizeof(*path->flags) ); - if (!path->points || !path->flags) - { - free_gdi_path( path ); - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return NULL; - } memcpy( path->points, src_path->points, path->count * sizeof(*path->points) ); memcpy( path->flags, src_path->flags, path->count * sizeof(*path->flags) ); return path;

1 0

Józef Kucia : wined3d: Implement SM4 umin instruction.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 4a5146a7e7005cda37a105908e016495e86399b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5146a7e7005cda37a105908… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:19 2016 +0200 wined3d: Implement SM4 umin 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 24c1194..179785d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5397,6 +5397,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_ULT */ NULL, /* WINED3DSIH_UMAX */ NULL, + /* WINED3DSIH_UMIN */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5e23920..3a6af83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3538,6 +3538,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; case WINED3DSIH_SQRT: instruction = "sqrt"; break; case WINED3DSIH_UMAX: instruction = "max"; break; + case WINED3DSIH_UMIN: instruction = "min"; break; default: instruction = ""; FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; @@ -8814,6 +8815,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_ULT */ shader_glsl_relop, /* WINED3DSIH_UMAX */ shader_glsl_map2gl, + /* WINED3DSIH_UMIN */ shader_glsl_map2gl, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6d4155b..01482ad 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -227,6 +227,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_ULT */ "ult", /* WINED3DSIH_UMAX */ "umax", + /* WINED3DSIH_UMIN */ "umin", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 24af95d..b7e9935 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -182,6 +182,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ULT = 0x4f, WINED3D_SM4_OP_UGE = 0x50, WINED3D_SM4_OP_UMAX = 0x53, + WINED3D_SM4_OP_UMIN = 0x54, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, @@ -762,6 +763,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ULT, WINED3DSIH_ULT, "u", "uu"}, {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "u", "uu"}, {WINED3D_SM4_OP_UMAX, WINED3DSIH_UMAX, "u", "uu"}, + {WINED3D_SM4_OP_UMIN, WINED3DSIH_UMIN, "u", "uu"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "u", "uu"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "f", "u"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "u", "uu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5c10a2..7e94193 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -743,6 +743,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_UGE, WINED3DSIH_ULT, WINED3DSIH_UMAX, + WINED3DSIH_UMIN, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Józef Kucia : d3d10core/tests: Add test for writing floating-point specials to render target.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 5c3114ab8ebadca0d658d539eb190c63b99b41d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3114ab8ebadca0d658d539e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:17 2016 +0200 d3d10core/tests: Add test for writing floating-point specials to render target. 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/d3d10core/tests/device.c | 84 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 26e525c..edfe27b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -38,6 +38,11 @@ struct vec4 float x, y, z, w; }; +struct uvec4 +{ + unsigned int x, y, z, w; +}; + static void set_box(D3D10_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) { box->left = left; @@ -78,6 +83,11 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } +static BOOL compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) +{ + return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w; +} + static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) @@ -508,6 +518,11 @@ static const struct vec4 *get_readback_vec4(struct texture_readback *rb, unsigne return &((const struct vec4 *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(struct vec4) + x]; } +static const struct uvec4 *get_readback_uvec4(struct texture_readback *rb, unsigned int x, unsigned int y) +{ + return &((const struct uvec4 *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(struct uvec4) + x]; +} + static void release_texture_readback(struct texture_readback *rb) { ID3D10Texture2D_Unmap(rb->texture, rb->sub_resource_idx); @@ -8600,6 +8615,74 @@ static void test_immediate_constant_buffer(void) release_test_context(&test_context); } +static void test_fp_specials(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + struct texture_readback rb; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int x, y; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + float4 main() : SV_Target + { + return float4(0.0f / 0.0f, 1.0f / 0.0f, -1.0f / 0.0f, 1.0f); + } +#endif + 0x43425844, 0x86d7f319, 0x14cde598, 0xe7ce83a8, 0x0e06f3f0, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xffc00000, + 0x7f800000, 0xff800000, 0x3f800000, 0x0100003e, + }; + const struct uvec4 expected_result = {0xffc00000, 0x7f800000, 0xff800000, 0x3f800000}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + draw_quad(&test_context); + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + for (x = 0; x < texture_desc.Width; ++x) + { + const struct uvec4 *value = get_readback_uvec4(&rb, x, y); + ok(compare_uvec4(value, &expected_result), + "Got unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n", + value->x, value->y, value->z, value->w, x, y); + } + } + release_texture_readback(&rb); + + ID3D10PixelShader_Release(ps); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -8645,4 +8728,5 @@ START_TEST(device) test_input_assembler(); test_null_sampler(); test_immediate_constant_buffer(); + test_fp_specials(); }

1 0

Józef Kucia : d3d11/tests: Add test for writing floating-point specials to render target.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: eda1fd79909ae5c5c54ef63062eb9bd6e8738704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda1fd79909ae5c5c54ef6306… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:16 2016 +0200 d3d11/tests: Add test for writing floating-point specials to render target. 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/d3d11/tests/d3d11.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 69cf5cd..a83f622 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -52,6 +52,11 @@ struct vec4 float x, y, z, w; }; +struct uvec4 +{ + unsigned int x, y, z, w; +}; + struct device_desc { const D3D_FEATURE_LEVEL *feature_level; @@ -106,6 +111,11 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } +static BOOL compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) +{ + return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w; +} + static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) @@ -658,6 +668,11 @@ static const struct vec4 *get_readback_vec4(struct texture_readback *rb, unsigne return &((const struct vec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct vec4) + x]; } +static const struct uvec4 *get_readback_uvec4(struct texture_readback *rb, unsigned int x, unsigned int y) +{ + return &((const struct uvec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct uvec4) + x]; +} + static void release_texture_readback(struct texture_readback *rb) { ID3D11DeviceContext_Unmap(rb->immediate_context, rb->texture, rb->sub_resource_idx); @@ -9262,6 +9277,76 @@ static void test_immediate_constant_buffer(void) release_test_context(&test_context); } +static void test_fp_specials(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + struct texture_readback rb; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int x, y; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + float4 main() : SV_Target + { + return float4(0.0f / 0.0f, 1.0f / 0.0f, -1.0f / 0.0f, 1.0f); + } +#endif + 0x43425844, 0x86d7f319, 0x14cde598, 0xe7ce83a8, 0x0e06f3f0, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xffc00000, + 0x7f800000, 0xff800000, 0x3f800000, 0x0100003e, + }; + const struct uvec4 expected_result = {0xffc00000, 0x7f800000, 0xff800000, 0x3f800000}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + draw_quad(&test_context); + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + for (x = 0; x < texture_desc.Width; ++x) + { + const struct uvec4 *value = get_readback_uvec4(&rb, x, y); + ok(compare_uvec4(value, &expected_result), + "Got unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n", + value->x, value->y, value->z, value->w, x, y); + } + } + release_texture_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11Texture2D_Release(texture); + ID3D11RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -9312,4 +9397,5 @@ START_TEST(d3d11) test_check_feature_support(); test_create_unordered_access_view(); test_immediate_constant_buffer(); + test_fp_specials(); }

1 0

Iván Matellanes : msvcirt: Implement istream::gcount.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: a7d22c2ec50971f94505abdde3f215caa5501407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d22c2ec50971f94505abdde… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 15 10:26:54 2016 +0100 msvcirt: Implement istream::gcount. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index cffd0da..f7fcedb 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3057,8 +3057,8 @@ void __thiscall istream_eatwhite(istream *this) DEFINE_THISCALL_WRAPPER(istream_gcount, 4) int __thiscall istream_gcount(const istream *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->count; } /* ?ipfx(a)istream@@QAEHH(a)Z */

1 0

Iván Matellanes : msvcirt: Add stub for class istream.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: db90b19a62faa3f0aa43b10618d5f9bafa761d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db90b19a62faa3f0aa43b1061… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 15 10:26:51 2016 +0100 msvcirt: Add stub for class istream. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 357 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 152 +++++++++---------- dlls/msvcrt20/msvcrt20.spec | 148 +++++++++--------- dlls/msvcrt40/msvcrt40.spec | 152 +++++++++---------- 4 files changed, 583 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db90b19a62faa3f0aa43b…

1 0

Józef Kucia : wined3d: Recognize SM4.1 lod opcode.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 16076752a6c85457d59ad09b9603dd2475cdd15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16076752a6c85457d59ad09b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:20 2016 +0200 wined3d: Recognize SM4.1 lod 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 179785d..21ee49e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5320,6 +5320,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LD_UAV_TYPED */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, + /* WINED3DSIH_LOD */ NULL, /* WINED3DSIH_LOG */ shader_hw_scalar_op, /* WINED3DSIH_LOGP */ shader_hw_scalar_op, /* WINED3DSIH_LOOP */ shader_hw_loop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3a6af83..9cc3117 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8738,6 +8738,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LD_UAV_TYPED */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, + /* WINED3DSIH_LOD */ NULL, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, /* WINED3DSIH_LOGP */ shader_glsl_scalar_op, /* WINED3DSIH_LOOP */ shader_glsl_loop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 01482ad..914970e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_LD_STRUCTURED */ "ld_structured", /* WINED3DSIH_LD_UAV_TYPED */ "ld_uav_typed", /* WINED3DSIH_LIT */ "lit", + /* WINED3DSIH_LOD */ "lod", /* WINED3DSIH_LOG */ "log", /* WINED3DSIH_LOGP */ "logp", /* WINED3DSIH_LOOP */ "loop", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b7e9935..a000bb6 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -203,6 +203,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_INDEXABLE_TEMP = 0x69, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + WINED3D_SM4_OP_LOD = 0x6c, WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, @@ -801,6 +802,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_indexable_temp}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, + {WINED3D_SM4_OP_LOD, WINED3DSIH_LOD, "f", "fRS"}, {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e94193..904eb86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -666,6 +666,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_LD_STRUCTURED, WINED3DSIH_LD_UAV_TYPED, WINED3DSIH_LIT, + WINED3DSIH_LOD, WINED3DSIH_LOG, WINED3DSIH_LOGP, WINED3DSIH_LOOP,

1 0

Iván Matellanes : msvcirt: Implement istream::isfx.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 3a4dd04b1152de1919831dfd6aaa32bb4c5b3147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4dd04b1152de1919831dfd6… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 15 10:26:56 2016 +0100 msvcirt: Implement istream::isfx. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 32c4698..6c0b9a4 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3097,7 +3097,12 @@ int __thiscall istream_ipfx(istream *this, int need) DEFINE_THISCALL_WRAPPER(istream_isfx, 4) void __thiscall istream_isfx(istream *this) { - FIXME("(%p) stub\n", this); + ios *base = istream_get_ios(this); + + TRACE("(%p)\n", this); + + ios_unlockbuf(base); + ios_unlock(base); } /* ?get(a)istream@@IAEAAV1(a)PADHH@Z */

1 0