wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Gabriel Ivăncescu : shell32/autocomplete: Move the autocomplete processing and WM_KEYUP to separate functions.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 779c5134626141dbfc2f2827651c80f7e0774566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=779c5134626141dbfc2f2827… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 17 22:23:09 2018 +0300 shell32/autocomplete: Move the autocomplete processing and WM_KEYUP to separate functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 336 ++++++++++++++++++++++++-------------------- 1 file changed, 182 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=779c5134626141dbfc2f…

1 0

Zebediah Figura : quartz/tests: Rewrite test_render_filter_priority().
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: f2a8d53580f6d01c6d8943cae36e662b1bd44053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a8d53580f6d01c6d8943ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:46 2018 -0500 quartz/tests: Rewrite test_render_filter_priority(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 1722 ++++++++++++--------------------------- 1 file changed, 527 insertions(+), 1195 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a8d53580f6d01c6d89…

1 0

Zebediah Figura : quartz/filtergraph: Use a linked list to store filters.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 2230834022869a32794f3de05ee1ac0e439cd354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2230834022869a32794f3de0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:45 2018 -0500 quartz/filtergraph: Use a linked list to store filters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 211 +++++++++++++++++++--------------------- dlls/quartz/tests/filtergraph.c | 7 -- 2 files changed, 98 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2230834022869a32794f…

1 0

Zebediah Figura : quartz/filtergraph: Pass an IFilterGraphImpl to create_enum_filters().
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 84255df7201308273a02564da3f90ff6df3bafce URL: https://source.winehq.org/git/wine.git/?a=commit;h=84255df7201308273a02564d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:44 2018 -0500 quartz/filtergraph: Pass an IFilterGraphImpl to create_enum_filters(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f0e91cb..76cc0c7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -211,15 +211,12 @@ struct enum_filters { IEnumFilters IEnumFilters_iface; LONG ref; - IGraphVersion *version_source; + IFilterGraphImpl *graph; LONG version; - IBaseFilter ***filters; - ULONG *count; ULONG index; }; -static HRESULT create_enum_filters(IGraphVersion *version_source, - IBaseFilter ***filters, ULONG *count, IEnumFilters **out); +static HRESULT create_enum_filters(IFilterGraphImpl *graph, IEnumFilters **out); static inline struct enum_filters *impl_from_IEnumFilters(IEnumFilters *iface) { @@ -261,7 +258,7 @@ static ULONG WINAPI EnumFilters_Release(IEnumFilters *iface) if (!ref) { - IGraphVersion_Release(enum_filters->version_source); + IUnknown_Release(enum_filters->graph->outer_unk); heap_free(enum_filters); } @@ -273,16 +270,13 @@ static HRESULT WINAPI EnumFilters_Next(IEnumFilters *iface, ULONG count, { struct enum_filters *enum_filters = impl_from_IEnumFilters(iface); unsigned int i, cFetched; - LONG version; - HRESULT hr; TRACE("enum_filters %p, count %u, filters %p, fetched %p.\n", enum_filters, count, filters, fetched); - cFetched = min(*enum_filters->count, enum_filters->index + count) - enum_filters->index; + cFetched = min(enum_filters->graph->nFilters, enum_filters->index + count) - enum_filters->index; - hr = IGraphVersion_QueryVersion(enum_filters->version_source, &version); - if (hr == S_OK && enum_filters->version != version) + if (enum_filters->version != enum_filters->graph->version) return VFW_E_ENUM_OUT_OF_SYNC; if (!filters) @@ -290,7 +284,7 @@ static HRESULT WINAPI EnumFilters_Next(IEnumFilters *iface, ULONG count, for (i = 0; i < cFetched; i++) { - filters[i] = (*enum_filters->filters)[enum_filters->index + i]; + filters[i] = enum_filters->graph->ppFiltersInGraph[enum_filters->index + i]; IBaseFilter_AddRef(filters[i]); } @@ -310,7 +304,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) TRACE("enum_filters %p, count %u.\n", enum_filters, count); - if (enum_filters->index + count < *enum_filters->count) + if (enum_filters->index + count < enum_filters->graph->nFilters) { enum_filters->index += count; return S_OK; @@ -321,15 +315,11 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) static HRESULT WINAPI EnumFilters_Reset(IEnumFilters *iface) { struct enum_filters *enum_filters = impl_from_IEnumFilters(iface); - LONG version; - HRESULT hr; TRACE("enum_filters %p.\n", enum_filters); enum_filters->index = 0; - hr = IGraphVersion_QueryVersion(enum_filters->version_source, &version); - if (hr == S_OK) - enum_filters->version = version; + enum_filters->version = enum_filters->graph->version; return S_OK; } @@ -340,7 +330,7 @@ static HRESULT WINAPI EnumFilters_Clone(IEnumFilters *iface, IEnumFilters **out) TRACE("enum_filters %p, out %p.\n", enum_filters, out); - hr = create_enum_filters(enum_filters->version_source, enum_filters->filters, enum_filters->count, out); + hr = create_enum_filters(enum_filters->graph, out); if (FAILED(hr)) return hr; return IEnumFilters_Skip(*out, enum_filters->index); @@ -357,12 +347,9 @@ static const IEnumFiltersVtbl EnumFilters_vtbl = EnumFilters_Clone, }; -static HRESULT create_enum_filters(IGraphVersion *version_source, - IBaseFilter ***filters, ULONG *count, IEnumFilters **out) +static HRESULT create_enum_filters(IFilterGraphImpl *graph, IEnumFilters **out) { struct enum_filters *enum_filters; - LONG version; - HRESULT hr; if (!(enum_filters = heap_alloc(sizeof(*enum_filters)))) return E_OUTOFMEMORY; @@ -370,11 +357,9 @@ static HRESULT create_enum_filters(IGraphVersion *version_source, enum_filters->IEnumFilters_iface.lpVtbl = &EnumFilters_vtbl; enum_filters->ref = 1; enum_filters->index = 0; - enum_filters->filters = filters; - enum_filters->count = count; - IGraphVersion_AddRef(enum_filters->version_source = version_source); - hr = IGraphVersion_QueryVersion(version_source, &version); - enum_filters->version = (hr == S_OK) ? version : 0; + enum_filters->graph = graph; + IUnknown_AddRef(graph->outer_unk); + enum_filters->version = graph->version; *out = &enum_filters->IEnumFilters_iface; return S_OK; @@ -738,7 +723,7 @@ static HRESULT WINAPI FilterGraph2_EnumFilters(IFilterGraph2 *iface, IEnumFilter TRACE("graph %p, out %p.\n", graph, out); - return create_enum_filters(&graph->IGraphVersion_iface, &graph->ppFiltersInGraph, &graph->nFilters, out); + return create_enum_filters(graph, out); } static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface,

1 0

Zebediah Figura : quartz: Merge enumfilters.c into filtergraph.c.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 0ac31b8a62f2dc7ae4a5a8b1e28ee209ee532cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac31b8a62f2dc7ae4a5a8b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:43 2018 -0500 quartz: Merge enumfilters.c into filtergraph.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/enumfilters.c | 215 ------------------------------------------- dlls/quartz/filtergraph.c | 182 +++++++++++++++++++++++++++++++++++- dlls/quartz/quartz_private.h | 1 - 4 files changed, 178 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ac31b8a62f2dc7ae4a5…

1 0

Zebediah Figura : quartz/filtergraph: Factor out find_filter_by_name().
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: f371176eb7bda2c9203720daa9577eb856f79594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f371176eb7bda2c9203720da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:42 2018 -0500 quartz/filtergraph: Factor out find_filter_by_name(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 60 +++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 59b7124..983e2c0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -365,13 +365,26 @@ static ULONG WINAPI FilterGraph2_Release(IFilterGraph2 *iface) return IUnknown_Release(This->outer_unk); } +static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *name) +{ + unsigned int i; + + for (i = 0; i < graph->nFilters; ++i) + { + if (!strcmpW(graph->pFilterNames[i], name)) + return graph->ppFiltersInGraph[i]; + } + + return NULL; +} + /*** IFilterGraph methods ***/ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *pFilter, LPCWSTR pName) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); HRESULT hr; - int i,j; + int j; WCHAR* wszFilterName = NULL; BOOL duplicate_name = FALSE; @@ -382,16 +395,8 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * wszFilterName = CoTaskMemAlloc( (pName ? strlenW(pName) + 6 : 5) * sizeof(WCHAR) ); - if (pName) - { - /* Check if name already exists */ - for(i = 0; i < This->nFilters; i++) - if (!strcmpW(This->pFilterNames[i], pName)) - { - duplicate_name = TRUE; - break; - } - } + if (pName && find_filter_by_name(This, pName)) + duplicate_name = TRUE; /* If no name given or name already existing, generate one */ if (!pName || duplicate_name) @@ -408,16 +413,11 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * sprintfW(wszFilterName, wszFmt2, This->nameIndex); TRACE("Generated name %s\n", debugstr_w(wszFilterName)); - /* Check if the generated name already exists */ - for(i = 0; i < This->nFilters; i++) - if (!strcmpW(This->pFilterNames[i], wszFilterName)) - break; - - /* Compute next index and exit if generated name is suitable */ if (This->nameIndex++ == 10000) This->nameIndex = 1; - if (i == This->nFilters) - break; + + if (!find_filter_by_name(This, wszFilterName)) + break; } /* Unable to find a suitable name */ if (j == 10000) @@ -567,28 +567,22 @@ static HRESULT WINAPI FilterGraph2_EnumFilters(IFilterGraph2 *iface, IEnumFilter return IEnumFiltersImpl_Construct(&This->IGraphVersion_iface, &This->ppFiltersInGraph, &This->nFilters, ppEnum); } -static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, LPCWSTR pName, - IBaseFilter **ppFilter) +static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, + const WCHAR *name, IBaseFilter **filter) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - int i; + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_w(pName), pName, ppFilter); + TRACE("graph %p, name %s, filter %p.\n", graph, debugstr_w(name), filter); - if (!ppFilter) + if (!filter) return E_POINTER; - for (i = 0; i < This->nFilters; i++) + if ((*filter = find_filter_by_name(graph, name))) { - if (!strcmpW(pName, This->pFilterNames[i])) - { - *ppFilter = This->ppFiltersInGraph[i]; - IBaseFilter_AddRef(*ppFilter); - return S_OK; - } + IBaseFilter_AddRef(*filter); + return S_OK; } - *ppFilter = NULL; return VFW_E_NOT_FOUND; }

1 0

Zebediah Figura : quartz/tests: Add some tests for IFilterGraph_EnumFilters().
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: e912f35f68be82989fecd95dff03ee609e9ccce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e912f35f68be82989fecd95d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:41 2018 -0500 quartz/tests: Add some tests for IFilterGraph_EnumFilters(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 103 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6a8afb3..4f1e9cf 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -592,6 +592,108 @@ todo_wine DeleteFileW(filename); } +static void test_enum_filters(void) +{ + IBaseFilter *filter1, *filter2, *filters[2]; + IFilterGraph2 *graph = create_graph(); + IEnumFilters *enum1, *enum2; + ULONG count, ref; + HRESULT hr; + + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter1); + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter2); + + hr = IFilterGraph2_EnumFilters(graph, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(enum1, 1, filters, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IFilterGraph2_AddFilter(graph, filter1, NULL); + IFilterGraph2_AddFilter(graph, filter2, NULL); + + hr = IEnumFilters_Next(enum1, 1, filters, NULL); + ok(hr == VFW_E_ENUM_OUT_OF_SYNC, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(enum1, 1, filters, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(filters[0] == filter2, "Got filter %p.\n", filters[0]); + IBaseFilter_Release(filters[0]); + + hr = IEnumFilters_Next(enum1, 1, filters, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); +todo_wine + ok(filters[0] == filter1, "Got filter %p.\n", filters[0]); + IBaseFilter_Release(filters[0]); + + hr = IEnumFilters_Next(enum1, 1, filters, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 0, "Got count %u.\n", count); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(enum1, 2, filters, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); +todo_wine { + ok(filters[0] == filter2, "Got filter %p.\n", filters[0]); + ok(filters[1] == filter1, "Got filter %p.\n", filters[1]); +} + IBaseFilter_Release(filters[0]); + IBaseFilter_Release(filters[1]); + + IFilterGraph2_RemoveFilter(graph, filter1); + IFilterGraph2_AddFilter(graph, filter1, NULL); + + hr = IEnumFilters_Next(enum1, 2, filters, &count); + ok(hr == VFW_E_ENUM_OUT_OF_SYNC, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(enum1, 2, filters, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); +todo_wine { + ok(filters[0] == filter1, "Got filter %p.\n", filters[0]); + ok(filters[1] == filter2, "Got filter %p.\n", filters[1]); +} + IBaseFilter_Release(filters[0]); + IBaseFilter_Release(filters[1]); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum2, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(enum2, 2, filters, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); +todo_wine + ok(filters[0] == filter2, "Got filter %p.\n", filters[0]); + IBaseFilter_Release(filters[0]); + + hr = IEnumFilters_Skip(enum1, 3); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumFilters_Release(enum2); + IEnumFilters_Release(enum1); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) { WCHAR *filename = load_resource(avifile); @@ -2402,6 +2504,7 @@ START_TEST(filtergraph) test_render_run(avifile); test_render_run(mpegfile); + test_enum_filters(); test_graph_builder(); test_render_filter_priority(); test_aggregate_filter_graph();

1 0

Józef Kucia : dxgi/tests: Add test for swapchain formats.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: d89ca410edba2fa765390fad528c64d0b39b2395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d89ca410edba2fa765390fad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:06:04 2018 +0200 dxgi/tests: Add test for swapchain 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/dxgi/tests/dxgi.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 376c1ec..9ab2472 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3804,7 +3804,7 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) { swapchain_desc.SwapEffect = tests[i].swap_effect; expected_hr = is_d3d12 && !tests[i].supported_in_d3d12 ? DXGI_ERROR_INVALID_CALL : S_OK; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); if (FAILED(hr)) continue; @@ -3837,6 +3837,102 @@ done: ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } +static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + HRESULT hr, expected_hr; + IDXGIFactory *factory; + unsigned int i; + ULONG refcount; + BOOL is_flip; + RECT rect; + BOOL ret; + + static const struct + { + DXGI_FORMAT format; + DXGI_SWAP_EFFECT swap_effect; + BOOL supported; + } + tests[] = + { + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + }; + + get_factory(device, is_d3d12, &factory); + + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 4; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.Flags = 0; + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain_desc.BufferDesc.Width = rect.right; + swapchain_desc.BufferDesc.Height = rect.bottom; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + is_flip = tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL + || tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_DISCARD; + + if (is_d3d12 && !is_flip) + continue; + + swapchain_desc.BufferDesc.Format = tests[i].format; + swapchain_desc.SwapEffect = tests[i].swap_effect; + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + expected_hr = tests[i].supported ? S_OK : DXGI_ERROR_INVALID_CALL; + ok(hr == expected_hr + /* Flip presentation model not supported. */ + || broken(is_flip && hr == DXGI_ERROR_INVALID_CALL), + "Test %u: Got hr %#x, expected %#x.\n", i, hr, expected_hr); + + if (SUCCEEDED(hr)) + { + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + } + } + + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); +} + static void test_maximum_frame_latency(void) { IDXGIDevice1 *device1; @@ -4210,6 +4306,7 @@ START_TEST(dxgi) test_swapchain_parameters(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_backbuffer_index); + run_on_d3d10(test_swapchain_formats); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -4228,6 +4325,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_backbuffer_index); + run_on_d3d12(test_swapchain_formats); FreeLibrary(d3d12_module); }

1 0

Józef Kucia : dxgi: Add support for DXGI_FORMAT_R16G16B16A16_FLOAT D3D12 swapchains.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 50ca01a3876856bb8f503426ffa9d4bc4b7b102d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50ca01a3876856bb8f503426… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:06:03 2018 +0200 dxgi: Add support for DXGI_FORMAT_R16G16B16A16_FLOAT D3D12 swapchains. 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/dxgi/swapchain.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 680fa54..3eefbe5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -989,6 +989,7 @@ static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return DXGI_FORMAT_R10G10B10A2_UNORM; + case VK_FORMAT_R16G16B16A16_SFLOAT: return DXGI_FORMAT_R16G16B16A16_FLOAT; default: WARN("Unhandled format %#x.\n", vk_format); return DXGI_FORMAT_UNKNOWN; @@ -999,8 +1000,10 @@ static VkFormat get_swapchain_fallback_format(VkFormat vk_format) { switch (vk_format) { - case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; - case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return VK_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_R8G8B8A8_UNORM: + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: + case VK_FORMAT_R16G16B16A16_SFLOAT: + return VK_FORMAT_B8G8R8A8_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return VK_FORMAT_UNDEFINED;

1 0

Józef Kucia : dxgi: Validate formats for flip presentation model.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: db30c0791f811099c47dcc68db7e00ae17f0b17f URL: https://source.winehq.org/git/wine.git/?a=commit;h=db30c0791f811099c47dcc68… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:06:02 2018 +0200 dxgi: Validate formats for flip presentation model. 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/dxgi/swapchain.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5d2cb4a..680fa54 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -55,6 +55,21 @@ static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect s } } +static BOOL dxgi_validate_flip_swap_effect_format(DXGI_FORMAT format) +{ + switch (format) + { + case DXGI_FORMAT_R16G16B16A16_FLOAT: + case DXGI_FORMAT_R10G10B10A2_UNORM: + case DXGI_FORMAT_R8G8B8A8_UNORM: + case DXGI_FORMAT_B8G8R8A8_UNORM: + return TRUE; + default: + WARN("Invalid swapchain format %#x for flip presentation model.\n", format); + return FALSE; + } +} + BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) { unsigned int min_buffer_count; @@ -70,6 +85,9 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; + if (!dxgi_validate_flip_swap_effect_format(desc->Format)) + return FALSE; + if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) { WARN("Invalid sample desc %u, %u for swap effect %#x.\n", @@ -968,9 +986,7 @@ static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) { switch (vk_format) { - case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; - case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return DXGI_FORMAT_R10G10B10A2_UNORM; default: @@ -983,7 +999,6 @@ static VkFormat get_swapchain_fallback_format(VkFormat vk_format) { switch (vk_format) { - case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return VK_FORMAT_B8G8R8A8_UNORM; default:

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
67
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 September 2018