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

Józef Kucia : d3d11: Recognize more BGR formats.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: b6f622c4614e90aa0867e9f28597702e5272aa47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f622c4614e90aa0867e9f28… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:21 2016 +0100 d3d11: Recognize more BGR formats. 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/utils.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 0163d6c..6c6212c 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -139,8 +139,12 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS); + WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); + WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); default: - FIXME("Unrecognized DXGI_FORMAT %#x\n", format); + FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); return "unrecognized"; } } @@ -240,6 +244,10 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM; case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; + case WINED3DFMT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_TYPELESS; + case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; + case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; default: FIXME("Unhandled wined3d format %#x.\n", format); return DXGI_FORMAT_UNKNOWN; @@ -339,8 +347,12 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B5G5R5A1_UNORM: return WINED3DFMT_B5G5R5A1_UNORM; case DXGI_FORMAT_B8G8R8A8_UNORM: return WINED3DFMT_B8G8R8A8_UNORM; case DXGI_FORMAT_B8G8R8X8_UNORM: return WINED3DFMT_B8G8R8X8_UNORM; + case DXGI_FORMAT_B8G8R8A8_TYPELESS: return WINED3DFMT_B8G8R8A8_TYPELESS; + case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; + case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; + case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; default: - FIXME("Unhandled DXGI_FORMAT %#x\n", format); + FIXME("Unhandled DXGI_FORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } }

1 0

Józef Kucia : d3d10core/tests: Add test for DXGI_FORMAT_BC4_UNORM format.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 08731933d2629b15ae776b2863d122464d5c448b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08731933d2629b15ae776b286… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:18 2016 +0100 d3d10core/tests: Add test for DXGI_FORMAT_BC4_UNORM format. 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 27c7ee0..806a1a2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3606,6 +3606,13 @@ static void test_texture(void) 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; + static const BYTE bc4_data[4 * 8] = + { + 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, + 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, + 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, + }; static const struct texture rgba_texture = { 4, 4, 3, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -3620,6 +3627,7 @@ static void test_texture(void) static const struct texture bc1_texture = {8, 8, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; + static const struct texture bc4_texture = {8, 8, 1, DXGI_FORMAT_BC4_UNORM, {{bc4_data, 2 * 8}}}; static const struct texture bc1_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC3_UNORM_SRGB, {{bc3_data, 2 * 16}}}; @@ -3662,6 +3670,13 @@ static void test_texture(void) 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, }; + static const DWORD bc4_colors[] = + { + 0xff000026, 0xff000010, 0xff00007f, 0xff00007f, + 0xff000010, 0xff000010, 0xff00007f, 0xff00007f, + 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, + 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, + }; static const DWORD sint8_colors[] = { 0x7e80807e, 0x7e807e7e, 0x7e807e80, 0x7e7e7e80, @@ -3696,6 +3711,7 @@ static void test_texture(void) {&ps_ld, &bc2_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, {&ps_ld, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_ld, &bc4_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_ld, &bc1_texture_srgb, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc2_texture_srgb, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture_srgb, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, @@ -3704,6 +3720,7 @@ static void test_texture(void) {&ps_sample, &bc1_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc2_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_sample, &bc4_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0},

1 0

Józef Kucia : d3d11/tests: Add test for DXGI_FORMAT_BC4_UNORM format.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 9447ce4312b8f6c9cb3f5c03a1a07f40c2e0d23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9447ce4312b8f6c9cb3f5c03a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:16 2016 +0100 d3d11/tests: Add test for DXGI_FORMAT_BC4_UNORM format. 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0d675f7..e76e9ac 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3269,6 +3269,13 @@ static void test_texture(void) 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; + static const BYTE bc4_data[4 * 8] = + { + 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, + 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, + 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, + }; static const struct texture rgba_texture = { 4, 4, 3, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -3283,6 +3290,7 @@ static void test_texture(void) static const struct texture bc1_texture = {8, 8, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; + static const struct texture bc4_texture = {8, 8, 1, DXGI_FORMAT_BC4_UNORM, {{bc4_data, 2 * 8}}}; static const struct texture bc1_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC3_UNORM_SRGB, {{bc3_data, 2 * 16}}}; @@ -3325,6 +3333,13 @@ static void test_texture(void) 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, }; + static const DWORD bc4_colors[] = + { + 0xff000026, 0xff000010, 0xff00007f, 0xff00007f, + 0xff000010, 0xff000010, 0xff00007f, 0xff00007f, + 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, + 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, + }; static const DWORD sint8_colors[] = { 0x7e80807e, 0x7e807e7e, 0x7e807e80, 0x7e7e7e80, @@ -3362,11 +3377,13 @@ static void test_texture(void) {&ps_ld, &bc1_texture_srgb, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc2_texture_srgb, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture_srgb, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc4_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_ld_sint8, &sint8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, {&ps_ld_uint8, &uint8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &bc1_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc2_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc3_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_sample, &bc4_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0},

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_BC5_UNORM format.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: cb6237c01830218f05491fa3a58f93d442c423fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6237c01830218f05491fa3a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:15 2016 +0100 wined3d: Add support for WINED3DFMT_BC5_UNORM format. 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/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 60ff776..8e3d64a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -242,6 +242,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, + {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, @@ -296,6 +297,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, + {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, @@ -1060,6 +1062,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, + GL_RG, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, 0,

1 0

Michael Stefaniuc : comctl32: Use SetRectEmty() instead of open coding it.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: d49201138d7f4740b1d0cc0190a572d7d8637091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49201138d7f4740b1d0cc019… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:58:40 2016 +0100 comctl32: Use SetRectEmty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 419a823..b467b36 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10061,7 +10061,7 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); ReleaseCapture(); - SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); + SetRectEmpty(&infoPtr->marqueeRect); infoPtr->bMarqueeSelect = FALSE; infoPtr->bScrolling = FALSE; @@ -10330,8 +10330,8 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT ReleaseCapture(); } - SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); - SetRect(&infoPtr->marqueeDrawRect, 0, 0, 0, 0); + SetRectEmpty(&infoPtr->marqueeRect); + SetRectEmpty(&infoPtr->marqueeDrawRect); infoPtr->bDragging = FALSE; infoPtr->bMarqueeSelect = FALSE;

1 0

Michael Stefaniuc : wined3d: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: a29a3c8a0bc2971ca5ff10f22f3d0fa9c7e73381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29a3c8a0bc2971ca5ff10f22… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:31:52 2016 +0100 wined3d: Use SetRectEmpty() 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/texture.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 90a3978..e126961 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1651,10 +1651,8 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un else if (flags & WINEDDOVER_HIDE) { /* Tests show that the rectangles are erased on hide. */ - surface->overlay_srcrect.left = 0; surface->overlay_srcrect.top = 0; - surface->overlay_srcrect.right = 0; surface->overlay_srcrect.bottom = 0; - surface->overlay_destrect.left = 0; surface->overlay_destrect.top = 0; - surface->overlay_destrect.right = 0; surface->overlay_destrect.bottom = 0; + SetRectEmpty(&surface->overlay_srcrect); + SetRectEmpty(&surface->overlay_destrect); surface->overlay_dest = NULL; }

1 0

Sebastian Lackner : services/tests: Initialize critical section just once.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: d98194e7917bd36dea232ef205c03a896c2fb8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98194e7917bd36dea232ef20… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:25:16 2016 +0100 services/tests: Initialize critical section just once. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index e228069..85b8e86 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -442,7 +442,6 @@ static void test_runner(void (*p_run_test)(void)) if(pipe_handle == INVALID_HANDLE_VALUE) return; - InitializeCriticalSection(&event_cs); event_handle = CreateEventA(NULL, FALSE, FALSE, NULL); ok(event_handle != INVALID_HANDLE_VALUE, "CreateEvent failed: %u\n", GetLastError()); if(event_handle == INVALID_HANDLE_VALUE) @@ -465,6 +464,8 @@ START_TEST(service) char **argv; int argc; + InitializeCriticalSection(&event_cs); + pRegisterServiceCtrlHandlerExA = (void*)GetProcAddress(GetModuleHandleA("advapi32.dll"), "RegisterServiceCtrlHandlerExA"); if(!pRegisterServiceCtrlHandlerExA) { win_skip("RegisterServiceCtrlHandlerExA not available, skipping tests\n");

1 0

Nikolay Sivov : dwrite: Implement HasCharacter() for a fontface.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: d27a792e486b40ea20d15ae60d8dfa1fc6ac086f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27a792e486b40ea20d15ae60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 08:16:26 2016 +0300 dwrite: Implement HasCharacter() for a fontface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c57a6f3..0ebb49c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1099,8 +1099,17 @@ static HRESULT WINAPI dwritefontface3_GetInformationalStrings(IDWriteFontFace3 * static BOOL WINAPI dwritefontface3_HasCharacter(IDWriteFontFace3 *iface, UINT32 ch) { struct dwrite_fontface *This = impl_from_IDWriteFontFace3(iface); - FIXME("(%p)->(0x%x): stub\n", This, ch); - return FALSE; + UINT16 index; + HRESULT hr; + + TRACE("(%p)->(0x%08x)\n", This, ch); + + index = 0; + hr = IDWriteFontFace3_GetGlyphIndices(iface, &ch, 1, &index); + if (FAILED(hr)) + return FALSE; + + return index != 0; } static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFace3 *iface, FLOAT emsize, FLOAT dpi_x, FLOAT dpi_y,

1 0

Stefan Dösinger : wined3d: Merge surface_prepare_buffer() and wined3d_volume_prepare_pbo().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 87143e60ed5708b976754da872f7643ce0982172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87143e60ed5708b976754da87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:20 2016 +0100 wined3d: Merge surface_prepare_buffer() and wined3d_volume_prepare_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 44 ++++++++---------------------------------- dlls/wined3d/texture.c | 21 ++++++++++++++++++++ dlls/wined3d/volume.c | 20 +------------------ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 32 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 208c254..3cd3782 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -489,40 +489,6 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; } -static void surface_prepare_buffer(struct wined3d_surface *surface) -{ - struct wined3d_context *context; - GLuint *buffer_object; - GLenum error; - const struct wined3d_gl_info *gl_info; - - buffer_object = &surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - if (*buffer_object) - return; - - context = context_acquire(surface->resource.device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glGenBuffers(1, buffer_object)); - error = gl_info->gl_ops.gl.p_glGetError(); - if (!*buffer_object || error != GL_NO_ERROR) - ERR("Failed to create a PBO with error %s (%#x).\n", debug_glerror(error), error); - - TRACE("Binding PBO %u.\n", *buffer_object); - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); - checkGLcall("glBindBuffer"); - - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, surface->resource.size + 4, - NULL, GL_STREAM_DRAW)); - checkGLcall("glBufferData"); - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - - context_release(context); -} - static void surface_prepare_system_memory(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); @@ -541,6 +507,9 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) void surface_prepare_map_memory(struct wined3d_surface *surface) { + struct wined3d_texture *texture = surface->container; + struct wined3d_context *context; + switch (surface->resource.map_binding) { case WINED3D_LOCATION_SYSMEM: @@ -548,7 +517,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_USER_MEMORY: - if (!surface->container->user_memory) + if (!texture->user_memory) ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); break; @@ -558,7 +527,10 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_BUFFER: - surface_prepare_buffer(surface); + context = context_acquire(texture->resource.device, NULL); + wined3d_texture_prepare_buffer_object(texture, + surface_get_sub_resource_idx(surface), context->gl_info); + context_release(context); break; default: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a8e9194..9846f07 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -690,6 +690,27 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return wined3d_surface_update_desc(surface, gl_info); } +/* Context activation is done by the caller. */ +void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) +{ + GLuint *buffer_object; + + buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + if (*buffer_object) + return; + + GL_EXTCALL(glGenBuffers(1, buffer_object)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); + GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, + texture->sub_resources[sub_resource_idx].resource->size, NULL, GL_STREAM_DRAW)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("Create buffer object"); + + TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", + *buffer_object, texture, sub_resource_idx); +} + void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ef0d69b..fcadd39 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -362,24 +362,6 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); } -/* Context activation is done by the caller. */ -static void wined3d_volume_prepare_pbo(struct wined3d_volume *volume, struct wined3d_context *context) -{ - GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (*buffer_object) - return; - - GL_EXTCALL(glGenBuffers(1, buffer_object)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, volume->resource.size, NULL, GL_STREAM_DRAW)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("Create PBO"); - - TRACE("Created PBO %u for volume %p.\n", *buffer_object, volume); -} - static void wined3d_volume_free_pbo(struct wined3d_volume *volume) { GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; @@ -506,7 +488,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, context = context_acquire(device, NULL); gl_info = context->gl_info; - wined3d_volume_prepare_pbo(volume, context); + wined3d_texture_prepare_buffer_object(texture, volume->texture_level, gl_info); if (flags & WINED3D_MAP_DISCARD) wined3d_volume_validate_location(volume, WINED3D_LOCATION_BUFFER); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 468ff11..28121b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2420,6 +2420,8 @@ struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_t UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Avoid volume_from_resource() in texture3d_prepare_texture().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 09c862b6a23c35c2157842f1f7a1fa9a8d17da1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c862b6a23c35c2157842f1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:17 2016 +0100 wined3d: Avoid volume_from_resource() in texture3d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index af1c1de..01f54a9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1207,7 +1207,7 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i].resource); + struct wined3d_volume *volume = texture->sub_resources[i].u.volume; GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal,

1 0