wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Józef Kucia : d3d11/tests: Add test for vertex formats.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 12a3121d212262ae34c3ac7fd617a4820f19d83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a3121d212262ae34c3ac7fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 8 12:12:30 2016 +0200 d3d11/tests: Add test for vertex 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/tests/d3d11.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ff7dd7..38dd9fb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8292,6 +8292,72 @@ static void test_sm4_breakc_instruction(void) release_test_context(&test_context); } +static void test_create_input_layout(void) +{ + D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_UNKNOWN, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + ID3D11InputLayout *input_layout; + ID3D11Device *device; + ULONG refcount; + unsigned int i; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DXGI_FORMAT vertex_formats[] = + { + DXGI_FORMAT_R32G32_FLOAT, + DXGI_FORMAT_R32G32_UINT, + DXGI_FORMAT_R32G32_SINT, + DXGI_FORMAT_R16G16_FLOAT, + DXGI_FORMAT_R16G16_UINT, + DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_UINT, + DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_UINT, + DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8_UINT, + DXGI_FORMAT_R8_SINT, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + for (i = 0; i < sizeof(vertex_formats) / sizeof(*vertex_formats); ++i) + { + layout_desc->Format = vertex_formats[i]; + hr = ID3D11Device_CreateInputLayout(device, layout_desc, + sizeof(layout_desc) / sizeof(*layout_desc), vs_code, sizeof(vs_code), + &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", + vertex_formats[i], hr); + ID3D11InputLayout_Release(input_layout); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_input_assembler(void) { enum layout_id @@ -9096,6 +9162,7 @@ START_TEST(d3d11) test_shader_stage_input_output_matching(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); + test_create_input_layout(); test_input_assembler(); test_null_sampler(); test_check_feature_support();

1 0

Józef Kucia : wined3d: Add more D3D10+ vertex formats.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: bfa4f4a075fabfdcf5eba1662bc6cd75cbb5c9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa4f4a075fabfdcf5eba1662… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 8 12:12:29 2016 +0200 wined3d: Add more D3D10+ vertex 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/wined3d/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 394f8ea..e1a7952 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -339,6 +339,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT, GL_FALSE}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE }, {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE, GL_FALSE}, + {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT, GL_FALSE}, {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT, GL_FALSE}, {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT, GL_FALSE}, {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE, GL_TRUE }, @@ -353,8 +354,14 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_FALSE}, + {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE, GL_FALSE}, + {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT, GL_FALSE}, {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT, GL_FALSE}, {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT, GL_FALSE}, {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, };

1 0

Sebastian Lackner : wininet/tests: Add a test for recently introduced regression related to InternetCrackUrl.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 93832ef88da8662f9991958413b0d46b07b3a80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93832ef88da8662f999195841… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 8 13:10:09 2016 +0200 wininet/tests: Add a test for recently introduced regression related to InternetCrackUrl. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 9be3839..7b1fd72 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -806,6 +806,19 @@ static void InternetCrackUrlW_test(void) ok( r, "InternetCrackUrlW failed unexpectedly\n"); ok( host[0] == 'x', "host should be x.org\n"); ok( urlpart[0] == 0, "urlpart should be empty\n"); + + urlpart[0] = 0; + host[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.lpszUrlPath = urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); + todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); + todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); + ok(urlpart[0] == 0, "urlpart should be empty\n"); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)

1 0

Sebastian Lackner : wininet/tests: Avoid unnecessary initialization of variables.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 259b517f2b929aee40db15ff3654a51496430997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=259b517f2b929aee40db15ff3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 8 12:08:39 2016 +0200 wininet/tests: Avoid unnecessary initialization of variables. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 0af1d77..9be3839 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -717,11 +717,7 @@ static void InternetCrackUrlW_test(void) ok( comp.dwExtraInfoLength == 29, "extra length wrong\n"); urlpart[0]=0; - scheme[0]=0; - extra[0]=0; host[0]=0; - user[0]=0; - pwd[0]=0; memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; @@ -739,11 +735,7 @@ static void InternetCrackUrlW_test(void) ok( comp.dwExtraInfoLength == 0, "extra length wrong\n"); urlpart[0]=0; - scheme[0]=0; - extra[0]=0; host[0]=0; - user[0]=0; - pwd[0]=0; memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host;

1 0

Michael Müller : wininet: Correctly set lpszUrlPath in InternetCrackUrlW for urls without path component.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: cacad1df98aceee3b2bf4f9a9c6978287b897be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacad1df98aceee3b2bf4f9a9… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 8 12:07:43 2016 +0200 wininet: Correctly set lpszUrlPath in InternetCrackUrlW for urls without path component. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 4 +--- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 19cf470..4e1f3b9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1917,9 +1917,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF } else { - if (lpUC->lpszUrlPath && (lpUC->dwUrlPathLength > 0)) - lpUC->lpszUrlPath[0] = 0; - lpUC->dwUrlPathLength = 0; + set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, lpszcp, 0); } TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_wn(lpszUrl,dwUrlLength), diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 00a457a..0af1d77 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -130,6 +130,9 @@ static const crack_url_test_t crack_url_tests[] = { {"HtTp://www.winehq.org/scheme", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 7, -1, 0, "HtTp", "www.winehq.org", "", "", "/scheme", ""}, + {"http://www.winehq.org", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, -1, 0, + "http", "www.winehq.org", "", "", "", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},

1 0

Piotr Caban : riched20: Add support for ECO_NOHIDESEL flag.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 060d8c6abb25119cfc67b069a7fe3a94248c3702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060d8c6abb25119cfc67b069a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 8 12:27:14 2016 +0200 riched20: Add support for ECO_NOHIDESEL flag. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 9 +++++++-- dlls/riched20/paint.c | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 13a2857..9ec72e2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3453,14 +3453,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_RewrapRepaint(editor); } + if ((changedSettings & settings & ES_NOHIDESEL) && !editor->bHaveFocus) + ME_InvalidateSelection( editor ); + if (changedSettings & settings & ECO_VERTICAL) FIXME("ECO_VERTICAL not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOHSCROLL) FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOVSCROLL) FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); - if (changedSettings & settings & ECO_NOHIDESEL) - FIXME("ECO_NOHIDESEL not implemented yet!\n"); if (changedSettings & settings & ECO_WANTRETURN) FIXME("ECO_WANTRETURN not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOWORDSELECTION) @@ -4257,6 +4258,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bHaveFocus = TRUE; ME_ShowCaret(editor); ME_SendOldNotify(editor, EN_SETFOCUS); + if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + ME_InvalidateSelection( editor ); return 0; case WM_KILLFOCUS: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ @@ -4264,6 +4267,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->wheel_remain = 0; ME_HideCaret(editor); ME_SendOldNotify(editor, EN_KILLFOCUS); + if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + ME_InvalidateSelection( editor ); return 0; case WM_COMMAND: TRACE("editor wnd command = %d\n", LOWORD(wParam)); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 8580539..42434b9 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -261,7 +261,8 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy ); - if (c->editor->bHideSelection) selected = FALSE; + if (c->editor->bHideSelection || (!c->editor->bHaveFocus && + !(c->editor->styleFlags & ES_NOHIDESEL))) selected = FALSE; if (c->editor->bEmulateVersion10) { old_style_selected = selected; @@ -355,7 +356,8 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, HGDIOBJ hOldFont; int yOffset = 0; BOOL selected = (nSelFrom < run->len && nSelTo >= 0 - && nSelFrom < nSelTo && !c->editor->bHideSelection); + && nSelFrom < nSelTo && !c->editor->bHideSelection && + (c->editor->bHaveFocus || (c->editor->styleFlags & ES_NOHIDESEL))); BOOL old_style_selected = FALSE; RECT sel_rect; HRGN clip = NULL, sel_rgn = NULL;

1 0

Henri Verbeet : wined3d: Synchronise resource destruction with the command stream.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: cc9c18a46d1ce7e2834bae0fa65a6ed7904820dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9c18a46d1ce7e2834bae0fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:05 2016 +0200 wined3d: Synchronise resource destruction with the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 ++ dlls/wined3d/resource.c | 2 ++ dlls/wined3d/texture.c | 1 + dlls/wined3d/wined3d_private.h | 16 ++++++++++++++++ 4 files changed, 21 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a15613d..674daec 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1342,6 +1342,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device ERR("Out of memory.\n"); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); + wined3d_resource_wait_idle(&buffer->resource); return E_OUTOFMEMORY; } buffer->maps_size = 1; @@ -1351,6 +1352,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device ERR("Failed to upload data, hr %#x.\n", hr); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); + wined3d_resource_wait_idle(&buffer->resource); HeapFree(GetProcessHeap(), 0, buffer->maps); return hr; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a475dc0..a17203d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -239,6 +239,7 @@ static void wined3d_resource_destroy_object(void *object) wined3d_resource_free_sysmem(resource); context_resource_released(resource->device, resource, resource->type); + wined3d_resource_release(resource); } void resource_cleanup(struct wined3d_resource *resource) @@ -254,6 +255,7 @@ void resource_cleanup(struct wined3d_resource *resource) } device_resource_released(resource->device, resource); + wined3d_resource_acquire(resource); wined3d_cs_emit_destroy_object(resource->device->cs, wined3d_resource_destroy_object, resource); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1283b0b..d8e6b86 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -816,6 +816,7 @@ static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) { wined3d_texture_sub_resources_destroyed(texture); resource_cleanup(&texture->resource); + wined3d_resource_wait_idle(&texture->resource); wined3d_texture_cleanup(texture); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8d97d2e..3de14e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2498,6 +2498,7 @@ struct wined3d_resource DWORD priority; void *heap_memory; struct list resource_list_entry; + LONG access_count; void *parent; const struct wined3d_parent_ops *parent_ops; @@ -2514,6 +2515,21 @@ static inline ULONG wined3d_resource_decref(struct wined3d_resource *resource) return resource->resource_ops->resource_decref(resource); } +static inline void wined3d_resource_acquire(struct wined3d_resource *resource) +{ + InterlockedIncrement(&resource->access_count); +} + +static inline void wined3d_resource_release(struct wined3d_resource *resource) +{ + InterlockedDecrement(&resource->access_count); +} + +static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) +{ + while (InterlockedCompareExchange(&resource->access_count, 0, 0)); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format,

1 0

Henri Verbeet : wined3d: Send buffer destruction through the command stream.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: b21f3c930eac9c8f5ff8fcb9383d4bec99e9ac6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21f3c930eac9c8f5ff8fcb93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:04 2016 +0200 wined3d: Send buffer destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8adc2a1..a15613d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -556,28 +556,35 @@ static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) device_invalidate_state(device, STATE_STREAMSRC); } +static void wined3d_buffer_destroy_object(void *object) +{ + struct wined3d_buffer *buffer = object; + struct wined3d_context *context; + + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL); + delete_gl_buffer(buffer, context->gl_info); + context_release(context); + + HeapFree(GetProcessHeap(), 0, buffer->conversion_map); + } + + HeapFree(GetProcessHeap(), 0, buffer->maps); + HeapFree(GetProcessHeap(), 0, buffer); +} + ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); - struct wined3d_context *context; TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) { - if (buffer->buffer_object) - { - context = context_acquire(buffer->resource.device, NULL); - delete_gl_buffer(buffer, context->gl_info); - context_release(context); - - HeapFree(GetProcessHeap(), 0, buffer->conversion_map); - } - - resource_cleanup(&buffer->resource); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); - HeapFree(GetProcessHeap(), 0, buffer->maps); - HeapFree(GetProcessHeap(), 0, buffer); + resource_cleanup(&buffer->resource); + wined3d_cs_emit_destroy_object(buffer->resource.device->cs, wined3d_buffer_destroy_object, buffer); } return refcount;

1 0

Henri Verbeet : wined3d: Send texture destruction through the command stream.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 1184237640ad33a23c7b48db146c17185ae3a048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1184237640ad33a23c7b48db1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:03 2016 +0200 wined3d: Send texture destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 59 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4ed5f12..1283b0b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -468,6 +468,24 @@ static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) resource_unload(&texture->resource); } +static void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_texture_sub_resource *sub_resource; + unsigned int i; + + for (i = 0; i < sub_count; ++i) + { + sub_resource = &texture->sub_resources[i]; + if (sub_resource->parent) + { + TRACE("sub-resource %u.\n", i); + sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); + sub_resource->parent = NULL; + } + } +} + static void wined3d_texture_cleanup(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -499,19 +517,8 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) if (context) context_release(context); - for (i = 0; i < sub_count; ++i) - { - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; - if (sub_resource->parent) - { - TRACE("sub-resource %u.\n", i); - sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); - } - } - texture->texture_ops->texture_cleanup_sub_resources(texture); wined3d_texture_unload_gl_texture(texture); - resource_cleanup(&texture->resource); } void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) @@ -805,6 +812,19 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) return refcount; } +static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) +{ + wined3d_texture_sub_resources_destroyed(texture); + resource_cleanup(&texture->resource); + wined3d_texture_cleanup(texture); +} + +static void wined3d_texture_destroy_object(void *object) +{ + wined3d_texture_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) { ULONG refcount; @@ -819,9 +839,10 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) if (!refcount) { - wined3d_texture_cleanup(texture); + wined3d_texture_sub_resources_destroyed(texture); texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); - HeapFree(GetProcessHeap(), 0, texture); + resource_cleanup(&texture->resource); + wined3d_cs_emit_destroy_object(texture->resource.device->cs, wined3d_texture_destroy_object, texture); } return refcount; @@ -1993,7 +2014,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 if (level_count > ~(SIZE_T)0 / layer_count || !(surfaces = wined3d_calloc(level_count * layer_count, sizeof(*surfaces)))) { - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; } @@ -2037,7 +2058,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { WARN("Failed to create surface parent, hr %#x.\n", hr); sub_resource->parent = NULL; - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return hr; } @@ -2048,7 +2069,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 if (((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) && FAILED(hr = wined3d_surface_create_dc(surface))) { - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return hr; } } @@ -2257,7 +2278,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct if (!(volumes = wined3d_calloc(level_count, sizeof(*volumes)))) { - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; } @@ -2280,7 +2301,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct { WARN("Failed to create volume parent, hr %#x.\n", hr); sub_resource->parent = NULL; - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return hr; } @@ -2585,7 +2606,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct * in this case. */ if (data && FAILED(hr = wined3d_texture_upload_data(object, data))) { - wined3d_texture_cleanup(object); + wined3d_texture_cleanup_sync(object); HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Henri Verbeet : wined3d: Call the sub-resource destruction callbacks in wined3d_texture_cleanup().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 229616a5faf41d8e0a1fa5a6ea8968a5f42e060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=229616a5faf41d8e0a1fa5a6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:02 2016 +0200 wined3d: Call the sub-resource destruction callbacks in wined3d_texture_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f42250b..4ed5f12 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -499,6 +499,16 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) if (context) context_release(context); + for (i = 0; i < sub_count; ++i) + { + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; + if (sub_resource->parent) + { + TRACE("sub-resource %u.\n", i); + sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); + } + } + texture->texture_ops->texture_cleanup_sub_resources(texture); wined3d_texture_unload_gl_texture(texture); resource_cleanup(&texture->resource); @@ -1518,8 +1528,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) list_remove(&overlay->overlay_entry); overlay->overlay_dest = NULL; } - - sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); } if (context) context_release(context); @@ -2028,6 +2036,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture, idx, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); + sub_resource->parent = NULL; wined3d_texture_cleanup(texture); return hr; } @@ -2106,21 +2115,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) { - unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_volume *volume; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - sub_resource = &texture->sub_resources[i]; - if ((volume = sub_resource->u.volume)) - { - TRACE("volume %p.\n", volume); - - sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); - } - } HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.volume); } @@ -2285,6 +2279,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); + sub_resource->parent = NULL; wined3d_texture_cleanup(texture); return hr; }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016