wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Piotr Caban : ole32: Initialize more FORMATETC fields using InitFormatEtc helper.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 058110369da4c0112d871477c960c463516d5dae URL: https://source.winehq.org/git/wine.git/?a=commit;h=058110369da4c0112d871477… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 26 14:52:22 2018 +0200 ole32: Initialize more FORMATETC fields using InitFormatEtc helper. 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/ole32/tests/clipboard.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index e518996..7aeaa20 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -508,13 +508,11 @@ static void test_get_clipboard(void) ok(hr == DV_E_FORMATETC || broken(hr == S_OK), "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); - InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); - fmtetc.cfFormat = CF_RIFF; + InitFormatEtc(fmtetc, CF_RIFF, TYMED_HGLOBAL); hr = IDataObject_QueryGetData(data_obj, &fmtetc); ok(hr == DV_E_CLIPFORMAT, "IDataObject_QueryGetData should have failed with DV_E_CLIPFORMAT instead of 0x%08x\n", hr); - InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); - fmtetc.tymed = TYMED_FILE; + InitFormatEtc(fmtetc, CF_TEXT, TYMED_FILE); hr = IDataObject_QueryGetData(data_obj, &fmtetc); ok(hr == S_OK, "IDataObject_QueryGetData failed with error 0x%08x\n", hr); @@ -552,14 +550,12 @@ static void test_get_clipboard(void) ReleaseStgMedium(&stgmedium); } - InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); - fmtetc.cfFormat = CF_RIFF; + InitFormatEtc(fmtetc, CF_RIFF, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); - InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); - fmtetc.tymed = TYMED_FILE; + InitFormatEtc(fmtetc, CF_TEXT, TYMED_FILE); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium);

1 0

Zebediah Figura : strmbase: Fix implementation of IEnumPins_Skip().
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 0e29ac058118abe33ea7f18a5b1369df75404a2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e29ac058118abe33ea7f18a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 26 23:36:23 2018 -0500 strmbase: Fix implementation of IEnumPins_Skip(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/enumpins.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 55fa7ec..abfaf69 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -162,19 +162,19 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** return S_OK; } -static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) +static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) { - IEnumPinsImpl *This = impl_from_IEnumPins(iface); + IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); - TRACE("(%p)->(%u)\n", iface, cPins); + TRACE("enum_pins %p, count %u.\n", enum_pins, count); - if (This->Version != This->receive_version(This->base)) + if (enum_pins->Version != enum_pins->receive_version(enum_pins->base)) return VFW_E_ENUM_OUT_OF_SYNC; - if (This->receive_pincount(This->base) >= This->uIndex + cPins) + if (enum_pins->uIndex + count > enum_pins->receive_pincount(enum_pins->base)) return S_FALSE; - This->uIndex += cPins; + enum_pins->uIndex += count; return S_OK; }

1 0

Zebediah Figura : quartz/filesource: Don't expose IAMFilterMiscFlags.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 2a1cc4330a2fc644b5884b8a4496f2e9173f2bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a1cc4330a2fc644b5884b8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 26 23:36:22 2018 -0500 quartz/filesource: Don't expose IAMFilterMiscFlags. This reverts 9dedc4a795bfbd0ec5c65a3a9d4788875b2ebc09. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 37 ------------------------------------- dlls/quartz/tests/filesource.c | 1 - 2 files changed, 38 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 67af560..e5904dc 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -41,7 +41,6 @@ typedef struct AsyncReader { BaseFilter filter; IFileSourceFilter IFileSourceFilter_iface; - IAMFilterMiscFlags IAMFilterMiscFlags_iface; IPin * pOutputPin; LPOLESTR pszFileName; @@ -63,15 +62,9 @@ static inline AsyncReader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) return CONTAINING_RECORD(iface, AsyncReader, IFileSourceFilter_iface); } -static inline AsyncReader *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) -{ - return CONTAINING_RECORD(iface, AsyncReader, IAMFilterMiscFlags_iface); -} - static const IBaseFilterVtbl AsyncReader_Vtbl; static const IFileSourceFilterVtbl FileSource_Vtbl; static const IAsyncReaderVtbl FileAsyncReader_Vtbl; -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); @@ -432,7 +425,6 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) BaseFilter_Init(&pAsyncRead->filter, &AsyncReader_Vtbl, &CLSID_AsyncReader, (DWORD_PTR)(__FILE__ ": AsyncReader.csFilter"), &BaseFuncTable); pAsyncRead->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; - pAsyncRead->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; pAsyncRead->pOutputPin = NULL; pAsyncRead->pszFileName = NULL; @@ -465,8 +457,6 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IFileSourceFilter)) *ppv = &This->IFileSourceFilter_iface; - else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_iface; if (*ppv) { @@ -1412,30 +1402,3 @@ static const IAsyncReaderVtbl FileAsyncReader_Vtbl = FileAsyncReader_BeginFlush, FileAsyncReader_EndFlush, }; - - -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { - AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); -} - -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { - AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { - AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { - return AM_FILTER_MISC_FLAGS_IS_SOURCE; -} - -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { - AMFilterMiscFlags_QueryInterface, - AMFilterMiscFlags_AddRef, - AMFilterMiscFlags_Release, - AMFilterMiscFlags_GetMiscFlags -}; diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 55c9bf2..b9040e2 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -54,7 +54,6 @@ static void test_interfaces(void) check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IFileSourceFilter, TRUE); -todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE);

1 0

Zebediah Figura : quartz/tests/filesource: Test interfaces exposed by the file source filter.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 835a9a815340be9d6beec56cace289ff124dbe55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=835a9a815340be9d6beec56c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 26 23:36:21 2018 -0500 quartz/tests/filesource: Test interfaces exposed by the file source filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 53 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 15a091b..55c9bf2 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -2,6 +2,7 @@ * File source filter unit tests * * Copyright 2016 Sebastian Lackner + * Copyright 2018 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,54 @@ #include "dshow.h" #include "wine/test.h" +static IBaseFilter *create_file_source(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_file_source(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IFileSourceFilter, TRUE); + +todo_wine + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); +} + static void test_file_source_filter(void) { static const WCHAR prefix[] = {'w','i','n',0}; @@ -101,8 +150,7 @@ static void test_file_source_filter(void) ok(ret, "Failed to write file, error %u.\n", GetLastError()); CloseHandle(file); - CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (void **)&filter); + filter = create_file_source(); IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); olepath = (void *)0xdeadbeef; @@ -149,6 +197,7 @@ START_TEST(filesource) { CoInitialize(NULL); + test_interfaces(); test_file_source_filter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Move file source filter tests to filesource.c.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 039525bc0c30f42778a3d5defd1943cbd2995228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=039525bc0c30f42778a3d5de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 26 23:36:20 2018 -0500 quartz/tests: Move file source filter tests to filesource.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/avisplitter.c | 132 ---------------------------------- dlls/quartz/tests/filesource.c | 155 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=039525bc0c30f42778a3…

1 0

Francois Gouget : quartz/tests: Make testpin_{AddRef, Release}() static.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: d2dbe856d4e4e690812784df73457b3c1cfefa62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2dbe856d4e4e690812784df… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 09:24:45 2018 +0200 quartz/tests: Make testpin_{AddRef,Release}() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 74a3b68..e64a9fa 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -878,13 +878,13 @@ static HRESULT WINAPI testpin_QueryInterface(IPin *iface, REFIID iid, void **out return E_NOINTERFACE; } -ULONG WINAPI testpin_AddRef(IPin *iface) +static ULONG WINAPI testpin_AddRef(IPin *iface) { struct testpin *pin = impl_from_IPin(iface); return InterlockedIncrement(&pin->ref); } -ULONG WINAPI testpin_Release(IPin *iface) +static ULONG WINAPI testpin_Release(IPin *iface) { struct testpin *pin = impl_from_IPin(iface); return InterlockedDecrement(&pin->ref);

1 0

Francois Gouget : winebus.sys: Add a trailing '\n' to a TRACE().
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 90de9129cc5f3458ddb88d8d1a09c415c896a66d URL: https://source.winehq.org/git/wine.git/?a=commit;h=90de9129cc5f3458ddb88d8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 09:24:35 2018 +0200 winebus.sys: Add a trailing '\n' to a TRACE(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6b1949c..cee0ae6 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -391,7 +391,7 @@ static NTSTATUS handle_IRP_MN_QUERY_DEVICE_RELATIONS(IRP *irp) NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - TRACE("IRP_MN_QUERY_DEVICE_RELATIONS"); + TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); switch (irpsp->Parameters.QueryDeviceRelations.Type) { case EjectionRelations:

1 0

Józef Kucia : tests: Add test for initial pipeline state.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: vkd3d Branch: master Commit: 34ceaecb50f3189273081bfca5b948c5b20affea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=34ceaecb50f3189273081bf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 27 13:30:56 2018 +0200 tests: Add test for initial pipeline state. 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> --- tests/d3d12.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ad5200d..8301067 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20023,6 +20023,82 @@ static void test_suballocate_small_textures(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_command_list_initial_pipeline_state(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + ID3D12PipelineState *pipeline_state; + ID3D12CommandAllocator *allocator; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(out float4 target : SV_Target) + { + target = float4(0.0f, 0.25f, 0.5f, 1.0f); + } +#endif + 0x43425844, 0x2f09e5ff, 0xaa135d5e, 0x7860f4b5, 0x5c7b8cbc, 0x00000001, 0x000000b4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, 0x0000000f, + 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x00000000, 0x3e800000, 0x3f000000, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + if (!init_test_context(&context, NULL)) + return; + queue = context.queue; + + pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + hr = ID3D12Device_CreateCommandAllocator(context.device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&allocator); + ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); + hr = ID3D12Device_CreateCommandList(context.device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + allocator, pipeline_state, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff804000, 1); + + hr = ID3D12CommandAllocator_Reset(allocator); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12GraphicsCommandList_Reset(command_list, allocator, context.pipeline_state); + ok(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12CommandAllocator_Release(allocator); + ID3D12GraphicsCommandList_Release(command_list); + ID3D12PipelineState_Release(pipeline_state); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -20143,4 +20219,5 @@ START_TEST(d3d12) run_test(test_combined_clip_and_cull_distances); run_test(test_resource_allocation_info); run_test(test_suballocate_small_textures); + run_test(test_command_list_initial_pipeline_state); }

1 0

Józef Kucia : tests: Add test for gather4_c shader instructions.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: vkd3d Branch: master Commit: 42b01a7189af317cb4d324dd863fb776f99b898c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=42b01a7189af317cb4d324d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 27 13:30:55 2018 +0200 tests: Add test for gather4_c shader instructions. 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> --- tests/d3d12.c | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 286 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=42b01a7189af317cb4d…

1 0

Józef Kucia : vkd3d-shader: Translate gather4_po_c instructions.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: vkd3d Branch: master Commit: a4cd1b255f29329a211fb8956bd81279c3da6c2d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a4cd1b255f29329a211fb89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 27 13:30:54 2018 +0200 vkd3d-shader: Translate gather4_po_c instructions. 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> --- libs/vkd3d-shader/spirv.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 07ac808..7fe3528 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5332,10 +5332,10 @@ static void vkd3d_dxbc_compiler_prepare_dummy_sampled_image(struct vkd3d_dxbc_co static void vkd3d_dxbc_compiler_prepare_sampled_image(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, - const struct vkd3d_shader_register *sampler_reg, bool depth_comparison) + const struct vkd3d_shader_register *sampler_reg, unsigned int flags) { vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(compiler, image, resource_reg, - vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg), depth_comparison); + vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg), flags); } static uint32_t vkd3d_dxbc_compiler_emit_texel_offset(struct vkd3d_dxbc_compiler *compiler, @@ -5489,6 +5489,7 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + unsigned int image_flags = VKD3D_IMAGE_FLAG_NONE; SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; @@ -5497,6 +5498,10 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile DWORD coordinate_mask; bool extended_offset; + if (instruction->handler_idx == VKD3DSIH_GATHER4_C + || instruction->handler_idx == VKD3DSIH_GATHER4_PO_C) + image_flags |= VKD3D_IMAGE_FLAG_DEPTH; + extended_offset = instruction->handler_idx == VKD3DSIH_GATHER4_PO || instruction->handler_idx == VKD3DSIH_GATHER4_PO_C; @@ -5506,7 +5511,7 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile sampler = &src[2 + extended_offset]; vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, - &resource->reg, &sampler->reg, VKD3D_IMAGE_FLAG_NONE); + &resource->reg, &sampler->reg, image_flags); if (offset) { @@ -5525,7 +5530,7 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, addr, coordinate_mask); - if (instruction->handler_idx == VKD3DSIH_GATHER4_C) + if (image_flags & VKD3D_IMAGE_FLAG_DEPTH) { dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3 + extended_offset], VKD3DSP_WRITEMASK_0); @@ -6414,6 +6419,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_GATHER4: case VKD3DSIH_GATHER4_C: case VKD3DSIH_GATHER4_PO: + case VKD3DSIH_GATHER4_PO_C: vkd3d_dxbc_compiler_emit_gather4(compiler, instruction); break; case VKD3DSIH_LD_RAW:

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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