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

Francois Gouget : msvcrt: The fpclass() constants are not defines.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 8e382e97e9c1209695b2ac621423852f7799d794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e382e97e9c1209695b2ac621… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 25 01:09:46 2016 +0200 msvcrt: The fpclass() constants are not defines. Solaris is the only platform that has fpclass() and it defines the constants in the fpclass_t enum. So this reverts commit b0047713142de79eba454d1196b230d53781518f. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b9e0533..402e8b2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -665,36 +665,16 @@ int CDECL MSVCRT__fpclass(double num) #if defined(HAVE_FPCLASS) || defined(fpclass) switch (fpclass( num )) { -#ifdef FP_SNAN case FP_SNAN: return MSVCRT__FPCLASS_SNAN; -#endif -#ifdef FP_QNAN case FP_QNAN: return MSVCRT__FPCLASS_QNAN; -#endif -#ifdef FP_NINF case FP_NINF: return MSVCRT__FPCLASS_NINF; -#endif -#ifdef FP_PINF case FP_PINF: return MSVCRT__FPCLASS_PINF; -#endif -#ifdef FP_NDENORM case FP_NDENORM: return MSVCRT__FPCLASS_ND; -#endif -#ifdef FP_PDENORM case FP_PDENORM: return MSVCRT__FPCLASS_PD; -#endif -#ifdef FP_NZERO case FP_NZERO: return MSVCRT__FPCLASS_NZ; -#endif -#ifdef FP_PZERO case FP_PZERO: return MSVCRT__FPCLASS_PZ; -#endif -#ifdef FP_NNORM case FP_NNORM: return MSVCRT__FPCLASS_NN; -#endif -#ifdef FP_PNORM case FP_PNORM: return MSVCRT__FPCLASS_PN; -#endif default: return MSVCRT__FPCLASS_PN; } #elif defined (fpclassify)

1 0

Francois Gouget : mshtml/tests: A spelling fix for a dom ok() message.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: ea12d857b45ed93631549ba521736d4f6f66ddb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea12d857b45ed93631549ba52… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:57 2016 +0200 mshtml/tests: A spelling fix for a dom ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9e8d8b5..7a39d34 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5775,7 +5775,7 @@ static void test_location(IHTMLDocument2 *doc) SysFreeString(str); ref = IHTMLLocation_Release(location); - ok(!ref, "location chould be destroyed here\n"); + ok(!ref, "location should be destroyed here\n"); } static void test_plugins_col(IHTMLDocument2 *doc)

1 0

Michael Müller : ws2_32: Fix getaddrinfo with IPPROTO_IPV6 protocol.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: ea18c740f79a6ad7e96f3655b5927ac496e5cb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea18c740f79a6ad7e96f3655b… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 25 22:12:21 2016 +0200 ws2_32: Fix getaddrinfo with IPPROTO_IPV6 protocol. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +++ dlls/ws2_32/tests/sock.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8d58631..a2e6912 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6471,6 +6471,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr else if (IS_IPX_PROTO(punixhints->ai_protocol) && punixhints->ai_socktype != SOCK_DGRAM) punixhints->ai_socktype = 0; + + else if (punixhints->ai_protocol == IPPROTO_IPV6) + punixhints->ai_protocol = 0; } /* getaddrinfo(3) is thread safe, no need to wrap in CS */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00555a9..9e0c2f9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -170,24 +170,32 @@ static const struct addr_hint_tests } hinttests[] = { {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0 }, {AF_UNSPEC, SOCK_STREAM, IPPROTO_UDP, 0 }, + {AF_UNSPEC, SOCK_STREAM, IPPROTO_IPV6,0 }, {AF_UNSPEC, SOCK_DGRAM, IPPROTO_TCP, 0 }, {AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, 0 }, + {AF_UNSPEC, SOCK_DGRAM, IPPROTO_IPV6,0 }, {AF_INET, SOCK_STREAM, IPPROTO_TCP, 0 }, {AF_INET, SOCK_STREAM, IPPROTO_UDP, 0 }, + {AF_INET, SOCK_STREAM, IPPROTO_IPV6,0 }, {AF_INET, SOCK_DGRAM, IPPROTO_TCP, 0 }, {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0 }, + {AF_INET, SOCK_DGRAM, IPPROTO_IPV6,0 }, {AF_UNSPEC, 0, IPPROTO_TCP, 0 }, {AF_UNSPEC, 0, IPPROTO_UDP, 0 }, + {AF_UNSPEC, 0, IPPROTO_IPV6,0 }, {AF_UNSPEC, SOCK_STREAM, 0, 0 }, {AF_UNSPEC, SOCK_DGRAM, 0, 0 }, {AF_INET, 0, IPPROTO_TCP, 0 }, {AF_INET, 0, IPPROTO_UDP, 0 }, + {AF_INET, 0, IPPROTO_IPV6,0 }, {AF_INET, SOCK_STREAM, 0, 0 }, {AF_INET, SOCK_DGRAM, 0, 0 }, {AF_UNSPEC, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT }, {AF_UNSPEC, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT }, + {AF_UNSPEC, 999, IPPROTO_IPV6,WSAESOCKTNOSUPPORT }, {AF_INET, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT }, {AF_INET, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT }, + {AF_INET, 999, IPPROTO_IPV6,WSAESOCKTNOSUPPORT }, {AF_UNSPEC, SOCK_STREAM, 999, 0 }, {AF_UNSPEC, SOCK_STREAM, 999, 0 }, {AF_INET, SOCK_DGRAM, 999, 0 },

1 0

Sebastian Lackner : server: Add missing linebreak to a dump message.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 240d8ed7e96ccf140543cc5c24124c8c6f481a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240d8ed7e96ccf140543cc5c2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 26 00:06:52 2016 +0200 server: Add missing linebreak to a dump message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/completion.c b/server/completion.c index 4069c0c..8b8983a 100644 --- a/server/completion.c +++ b/server/completion.c @@ -104,7 +104,7 @@ static void completion_dump( struct object *obj, int verbose ) struct completion *completion = (struct completion *) obj; assert( obj->ops == &completion_ops ); - fprintf( stderr, "Completion depth=%u", completion->depth ); + fprintf( stderr, "Completion depth=%u\n", completion->depth ); } static struct object_type *completion_get_type( struct object *obj )

1 0

Sebastian Lackner : server: Fix possible leak of root object in create_named_pipe handler.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 20651c7dfe74aad58d17e527438df350b1b1afac URL: http://source.winehq.org/git/wine.git/?a=commit;h=20651c7dfe74aad58d17e5274… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 26 03:34:58 2016 +0200 server: Fix possible leak of root object in create_named_pipe handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/named_pipe.c b/server/named_pipe.c index f41c26e..0661c12 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -901,6 +901,7 @@ DECL_HANDLER(create_named_pipe) if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE)) || (!(req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && (req->flags & NAMED_PIPE_MESSAGE_STREAM_READ))) { + if (root) release_object( root ); set_error( STATUS_INVALID_PARAMETER ); return; }

1 0

Dmitry Timoshkov : shlwapi: Fix IStream::Read() return value for partial reads.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 860f5562c70520a0acfe0cec6261dc8e96bfc619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860f5562c70520a0acfe0cec6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 25 22:39:04 2016 +0200 shlwapi: Fix IStream::Read() return value for partial reads. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 2 +- dlls/shlwapi/tests/istream.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index e641995..946d2c8 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -130,7 +130,7 @@ static HRESULT WINAPI IStream_fnRead(IStream *iface, void* pv, ULONG cb, ULONG* } if (pcbRead) *pcbRead = dwRead; - return S_OK; + return dwRead == cb ? S_OK : S_FALSE; } /************************************************************************** diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 48a292a..c9cf62f 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -247,11 +247,24 @@ static void test_stream_read_write(IStream *stream, DWORD mode) } else { -todo_wine ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); ok(count == 0, "expected 0, got %u\n", count); } + ret = stream->lpVtbl->Seek(stream, start, STREAM_SEEK_SET, NULL); + ok(ret == S_OK, "Seek error %#x\n", ret); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, 0, &count); + ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == 0, "expected 0, got %u\n", count); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, sizeof(buf), &count); + ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == written, "expected %u, got %u\n", written, count); + if (count) + ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); } static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm)

1 0

Józef Kucia : wined3d: Add "layer_count" parameter to wined3d_texture_create().
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 64014ae3ed5ff5785ccbb74684ab2c7ffab157b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64014ae3ed5ff5785ccbb7468… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 25 12:25:29 2016 +0200 wined3d: Add "layer_count" parameter to wined3d_texture_create(). 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 | 6 +++--- dlls/d3d11/tests/d3d11.c | 6 +++--- dlls/d3d11/texture.c | 8 +++----- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/texture.c | 6 +++--- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/texture.c | 6 +++--- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 47 +++++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 14 files changed, 62 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64014ae3ed5ff5785ccbb…

1 0

Józef Kucia : wined3d: Implement creating 2D array textures.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 64da6b05260ab8bea430872b47783d469dcddeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=64da6b05260ab8bea430872b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 25 12:25:30 2016 +0200 wined3d: Implement creating 2D array textures. 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/surface.c | 57 ++++++++++++++++++++++++++++++++++++++------------ dlls/wined3d/texture.c | 35 ++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c12f48..28da2eb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -993,14 +993,25 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w else internal = format->glInternal; - TRACE("glCompressedTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, " - "format %#x, image_size %#x, addr %p.\n", surface->texture_target, surface->texture_level, + TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " + "format %#x, image_size %#x, addr %p.\n", + surface->texture_target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr); if (row_length == src_pitch) { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr)); + if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, + dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, + internal, row_count * row_length, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, + dst_point->x, dst_point->y, update_w, update_h, + internal, row_count * row_length, addr)); + } } else { @@ -1010,13 +1021,23 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w * can't use the unpack row length like for glTexSubImage2D. */ for (row = 0, y = dst_point->y; row < row_count; ++row) { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, y, update_w, format->block_height, internal, row_length, addr)); + if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, + dst_point->x, y, surface->texture_layer, update_w, format->block_height, 1, + internal, row_length, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, + dst_point->x, y, update_w, format->block_height, internal, row_length, addr)); + } + y += format->block_height; addr += src_pitch; } } - checkGLcall("glCompressedTexSubImage2D"); + checkGLcall("Upload compressed surface data"); } else { @@ -1025,15 +1046,25 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w addr += src_rect->top * src_pitch; addr += src_rect->left * format->byte_count; - TRACE("glTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, format %#x, type %#x, addr %p.\n", - surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, - update_w, update_h, format->glFormat, format->glType, addr); + TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " + "format %#x, type %#x, addr %p.\n", + surface->texture_target, surface->texture_level, surface->texture_layer, + dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); - gl_info->gl_ops.gl.p_glTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexSubImage3D(surface->texture_target, surface->texture_level, + dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, + format->glFormat, format->glType, addr)); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(surface->texture_target, surface->texture_level, + dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - checkGLcall("glTexSubImage2D"); + checkGLcall("Upload surface data"); } if (data->buffer_object) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5e18c4c..3a03bb6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1359,10 +1359,10 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in /* Context activation is done by the caller. */ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { - UINT sub_count = texture->level_count * texture->layer_count; const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_color_key_conversion *conversion; + unsigned int sub_call_count; GLenum internal; UINT i; @@ -1394,7 +1394,10 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); - for (i = 0; i < sub_count; ++i) + sub_call_count = texture->level_count; + if (texture->target != GL_TEXTURE_2D_ARRAY) + sub_call_count *= texture->layer_count; + for (i = 0; i < sub_call_count; ++i) { struct wined3d_surface *surface = texture->sub_resources[i].u.surface; GLsizei width, height; @@ -1407,12 +1410,22 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi height /= format->height_scale.denominator; } - TRACE("surface %p, target %#x, level %d, width %d, height %d.\n", + TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", surface, surface->texture_target, surface->texture_level, width, height); - gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, - internal, width, height, 0, format->glFormat, format->glType, NULL); - checkGLcall("glTexImage2D"); + if (texture->target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexImage3D(surface->texture_target, surface->texture_level, + internal, width, height, texture->layer_count, 0, + format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); + } + else + { + gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, + internal, width, height, 0, format->glFormat, format->glType, NULL); + checkGLcall("glTexImage2D"); + } } } @@ -1778,8 +1791,12 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 unsigned int i, j; HRESULT hr; - if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count != 1) - FIXME("Array textures not implemented.\n"); + if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 + && !gl_info->supported[EXT_TEXTURE_ARRAY]) + { + WARN("OpenGL implementation does not support array textures.\n"); + return WINED3DERR_INVALIDCALL; + } /* TODO: It should only be possible to create textures for formats * that are reported as supported. */ @@ -1909,6 +1926,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) texture->target = GL_TEXTURE_CUBE_MAP_ARB; + else if (layer_count > 1) + texture->target = GL_TEXTURE_2D_ARRAY; else texture->target = GL_TEXTURE_2D; }

1 0

Józef Kucia : d3d11/tests: Check all sub-resources in check_texture_* functions.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 569a7d34d83d91a6120f5c8a2e3795b11d0721bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=569a7d34d83d91a6120f5c8a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 25 12:25:31 2016 +0200 d3d11/tests: Check all sub-resources in check_texture_* functions. 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 | 83 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4f3ff8e..95afdac 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -118,12 +118,14 @@ struct texture_readback ID3D11Resource *texture; D3D11_MAPPED_SUBRESOURCE map_desc; ID3D11DeviceContext *immediate_context; - unsigned int width, height; + unsigned int width, height, sub_resource_idx; }; -static void get_texture_readback(ID3D11Texture2D *texture, struct texture_readback *rb) +static void get_texture_readback(ID3D11Texture2D *texture, unsigned int sub_resource_idx, + struct texture_readback *rb) { D3D11_TEXTURE2D_DESC texture_desc; + unsigned int miplevel; ID3D11Device *device; HRESULT hr; @@ -143,15 +145,18 @@ static void get_texture_readback(ID3D11Texture2D *texture, struct texture_readba return; } - rb->width = texture_desc.Width; - rb->height = texture_desc.Height; + miplevel = sub_resource_idx % texture_desc.MipLevels; + rb->width = max(1, texture_desc.Width >> miplevel); + rb->height = max(1, texture_desc.Height >> miplevel); + rb->sub_resource_idx = sub_resource_idx; ID3D11Device_GetImmediateContext(device, &rb->immediate_context); ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->texture, (ID3D11Resource *)texture); - if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, rb->texture, 0, D3D11_MAP_READ, 0, &rb->map_desc))) + if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, rb->texture, sub_resource_idx, + D3D11_MAP_READ, 0, &rb->map_desc))) { - trace("Failed to map texture, hr %#x.\n", hr); + trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); ID3D11Resource_Release(rb->texture); rb->texture = NULL; ID3D11DeviceContext_Release(rb->immediate_context); @@ -173,7 +178,7 @@ static float get_readback_float(struct texture_readback *rb, unsigned int x, uns static void release_texture_readback(struct texture_readback *rb) { - ID3D11DeviceContext_Unmap(rb->immediate_context, rb->texture, 0); + ID3D11DeviceContext_Unmap(rb->immediate_context, rb->texture, rb->sub_resource_idx); ID3D11Resource_Release(rb->texture); ID3D11DeviceContext_Release(rb->immediate_context); } @@ -183,23 +188,23 @@ static DWORD get_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigne struct texture_readback rb; DWORD color; - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); color = get_readback_color(&rb, x, y); release_texture_readback(&rb); return color; } -#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) -static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, - DWORD expected_color, BYTE max_diff) +#define check_texture_sub_resource_color(t, s, c, d) check_texture_sub_resource_color_(__LINE__, t, s, c, d) +static void check_texture_sub_resource_color_(unsigned int line, ID3D11Texture2D *texture, + unsigned int sub_resource_idx, DWORD expected_color, BYTE max_diff) { struct texture_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; DWORD color = 0; - get_texture_readback(texture, &rb); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -216,19 +221,33 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); + "Got unexpected color 0x%08x at (%u, %u), sub-resource %u.\n", + color, x, y, sub_resource_idx); } -#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) -static void check_texture_float_(unsigned int line, ID3D11Texture2D *texture, - float expected_value, BYTE max_diff) +#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) +static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D11_TEXTURE2D_DESC texture_desc; + + ID3D11Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); +} + +#define check_texture_sub_resource_float(t, s, c, d) check_texture_sub_resource_flot_(__LINE__, t, s, c, d) +static void check_texture_sub_resource_float_(unsigned int line, ID3D11Texture2D *texture, + unsigned int sub_resource_idx, float expected_value, BYTE max_diff) { struct texture_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; float value = 0.0f; - get_texture_readback(texture, &rb); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -245,7 +264,21 @@ static void check_texture_float_(unsigned int line, ID3D11Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value %.8e at (%u, %u).\n", value, x, y); + "Got unexpected value %.8e at (%u, %u), sub-resource %u.\n", + value, x, y, sub_resource_idx); +} + +#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) +static void check_texture_float_(unsigned int line, ID3D11Texture2D *texture, + float expected_value, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D11_TEXTURE2D_DESC texture_desc; + + ID3D11Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); } static ID3D11Device *create_device(const struct device_desc *desc) @@ -4271,7 +4304,7 @@ static void test_texture(void) draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (y = 0; y < 4; ++y) { for (x = 0; x < 4; ++x) @@ -5042,7 +5075,7 @@ static void test_update_subresource(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, &box, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5058,7 +5091,7 @@ static void test_update_subresource(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, NULL, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5244,7 +5277,7 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 0, 0, 0, (ID3D11Resource *)src_texture, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5260,7 +5293,7 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 0, 0, 0, (ID3D11Resource *)src_texture, 0, NULL); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5343,7 +5376,7 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_buffer, 0, 0, 0, 0, (ID3D11Resource *)src_buffer, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -6271,7 +6304,7 @@ static void test_draw_depth_only(void) draw_quad(&test_context); } } - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0

Józef Kucia : d3d11/tests: Add tests for 2D texture RTVs.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 369d0da431e835bff590a78d03b3c216f9938f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=369d0da431e835bff590a78d0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 25 12:25:32 2016 +0200 d3d11/tests: Add tests for 2D texture RTVs. 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 | 191 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 95afdac..03b6113 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #define COBJMACROS #include "initguid.h" #include "d3d11.h" @@ -401,6 +402,9 @@ struct d3d11_test_context ID3D11InputLayout *input_layout; ID3D11VertexShader *vs; ID3D11Buffer *vb; + + ID3D11PixelShader *ps; + ID3D11Buffer *ps_cb; }; #define init_test_context(c, l) init_test_context_(__LINE__, c, l) @@ -456,6 +460,10 @@ static void release_test_context_(unsigned int line, struct d3d11_test_context * ID3D11VertexShader_Release(context->vs); if (context->vb) ID3D11Buffer_Release(context->vb); + if (context->ps) + ID3D11PixelShader_Release(context->ps); + if (context->ps_cb) + ID3D11Buffer_Release(context->ps_cb); ID3D11DeviceContext_Release(context->immediate_context); ID3D11RenderTargetView_Release(context->backbuffer_rtv); @@ -543,6 +551,59 @@ static void draw_quad_(unsigned int line, struct d3d11_test_context *context) ID3D11DeviceContext_Draw(context->immediate_context, 4, 0); } +#define draw_color_quad(c, color) draw_color_quad_(__LINE__, c, color) +static void draw_color_quad_(unsigned int line, struct d3d11_test_context *context, const struct vec4 *color) +{ + static const DWORD ps_color_code[] = + { +#if 0 + float4 color; + + float4 main() : SV_TARGET + { + return color; + } +#endif + 0x43425844, 0x80f1c810, 0xdacbbc8b, 0xe07b133e, 0x3059cbfa, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000040, 0x00000040, 0x00000010, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + + ID3D11Device *device = context->device; + D3D11_BUFFER_DESC buffer_desc; + HRESULT hr; + + if (!context->ps) + { + hr = ID3D11Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), NULL, &context->ps); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + + if (!context->ps_cb) + { + buffer_desc.ByteWidth = sizeof(*color); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &context->ps_cb); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + } + + ID3D11DeviceContext_PSSetShader(context->immediate_context, context->ps, NULL, 0); + ID3D11DeviceContext_PSSetConstantBuffers(context->immediate_context, 0, 1, &context->ps_cb); + + ID3D11DeviceContext_UpdateSubresource(context->immediate_context, (ID3D11Resource *)context->ps_cb, 0, + NULL, color, 0, 0); + + draw_quad_(line, context); +} + static void test_create_device(void) { static const D3D_FEATURE_LEVEL default_feature_levels[] = @@ -4504,6 +4565,135 @@ static void test_multiple_render_targets(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_render_target_views(void) +{ + struct texture + { + UINT miplevel_count; + UINT array_size; + }; + struct rtv + { + DXGI_FORMAT format; + D3D11_RTV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + }; + + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static struct test + { + struct texture texture; + struct rtv rtv; + DWORD expected_colors[4]; + } + tests[] = + { + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2D, 1}, + {0x00000000, 0xff0000ff}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 2, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 3, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 4}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D11_RTV_DIMENSION_TEXTURE2DARRAY, 1, 1, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + }; + + struct d3d11_test_context test_context; + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int i, j; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + unsigned int sub_resource_count; + + texture_desc.MipLevels = test->texture.miplevel_count; + texture_desc.ArraySize = test->texture.array_size; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + + rtv_desc.Format = texture_desc.Format; + rtv_desc.ViewDimension = test->rtv.dimension; + if (test->rtv.dimension == D3D11_RTV_DIMENSION_TEXTURE2D) + { + U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; + } + else if (test->rtv.dimension == D3D11_RTV_DIMENSION_TEXTURE2DARRAY) + { + U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; + U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; + U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; + } + else + { + trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); + } + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + draw_color_quad(&test_context, &red); + + sub_resource_count = texture_desc.MipLevels * texture_desc.ArraySize; + assert(sub_resource_count <= sizeof(test->expected_colors) / sizeof(*test->expected_colors)); + for (j = 0; j < sub_resource_count; ++j) + check_texture_sub_resource_color(texture, j, test->expected_colors[j], 1); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + } + + release_test_context(&test_context); +} + static void test_scissor(void) { struct d3d11_test_context test_context; @@ -6627,6 +6817,7 @@ START_TEST(d3d11) test_blend(); test_texture(); test_multiple_render_targets(); + test_render_target_views(); test_scissor(); test_il_append_aligned(); test_fragment_coords();

1 0