wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Jan Sikorski : wined3d: Added missing states to debug_d3dstate().
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3655e7d9450692fac0d9a2d71c8c110024e5fd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3655e7d9450692fac0d9a2d7… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Feb 3 14:12:49 2021 +0100 wined3d: Added missing states to debug_d3dstate(). Signed-off-by: Jan Sikorski <jsikorski(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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e7e04e81557..daf079f50dc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5197,6 +5197,12 @@ const char *debug_d3dstate(DWORD state) return "STATE_BLEND"; if (STATE_IS_BLEND_FACTOR(state)) return "STATE_BLEND_FACTOR"; + if (STATE_IS_SAMPLE_MASK(state)) + return "STATE_SAMPLE_MASK"; + if (STATE_IS_DEPTH_STENCIL(state)) + return "STATE_DEPTH_STENCIL"; + if (STATE_IS_STENCIL_REF(state)) + return "STATE_STENCIL_REF"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); }

1 0

Jan Sikorski : wined3d: Check for stencil reference change in vulkan backend.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 433aaccc1fd424108f19075f4b464c05b1a8cbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=433aaccc1fd424108f19075f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Feb 3 14:12:48 2021 +0100 wined3d: Check for stencil reference change in vulkan backend. Make stencil reference value dynamic, so it can be updated separately. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50380 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 55127e44a00..f24f6bec6df 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1493,6 +1493,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_invalidate_state(&context_vk->c, STATE_STREAMSRC); context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); + context_invalidate_state(&context_vk->c, STATE_STENCIL_REF); VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); @@ -1701,6 +1702,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context static const VkDynamicState dynamic_states[] = { VK_DYNAMIC_STATE_BLEND_CONSTANTS, + VK_DYNAMIC_STATE_STENCIL_REFERENCE, }; key = &context_vk->graphics.pipeline_key_vk; @@ -2076,8 +2078,6 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(d->desc.front.func); key->ds_desc.front.compareMask = d->desc.stencil_read_mask; key->ds_desc.front.writeMask = d->desc.stencil_write_mask; - key->ds_desc.front.reference = state->stencil_ref - & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); key->ds_desc.back.failOp = vk_stencil_op_from_wined3d(d->desc.back.fail_op); key->ds_desc.back.passOp = vk_stencil_op_from_wined3d(d->desc.back.pass_op); @@ -2085,8 +2085,6 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.compareOp = vk_compare_op_from_wined3d(d->desc.back.func); key->ds_desc.back.compareMask = d->desc.stencil_read_mask; key->ds_desc.back.writeMask = d->desc.stencil_write_mask; - key->ds_desc.back.reference = state->stencil_ref - & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } else { @@ -3033,6 +3031,12 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c VK_PIPELINE_BIND_POINT_GRAPHICS, context_vk->graphics.vk_pipeline)); } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STENCIL_REF) && dsv) + { + VK_CALL(vkCmdSetStencilReference(vk_command_buffer, VK_STENCIL_FACE_FRONT_AND_BACK, + state->stencil_ref & ((1 << dsv->format->stencil_size) - 1))); + } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC)) wined3d_context_vk_bind_vertex_buffers(context_vk, vk_command_buffer, state, vk_info);

1 0

Jan Sikorski : wined3d: Store stencil reference value in wined3d_state.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: f3aceef72559d9655e58779f1131b643e994e493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3aceef72559d9655e58779f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Feb 3 14:12:47 2021 +0100 wined3d: Store stencil reference value in wined3d_state. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 15 +++------------ dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/cs.c | 16 ++++++++++++---- dlls/wined3d/device.c | 25 +++++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 4 ++-- 10 files changed, 48 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3aceef72559d9655e58…

1 0

Dmitry Timoshkov : shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: dbb1ed4895079f67ae385afe878e924d3249037b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb1ed4895079f67ae385afe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 12:40:43 2021 +0000 shell32: IPersistFile::Save(NULL) should use previously stored file name. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 16 ++++++++++++---- dlls/shell32/tests/shelllink.c | 25 ++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 46d9bc994ff..69d610f2503 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + if (!This->filepath) return S_OK; + + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +384,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1d..edd536c3a01 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -388,7 +388,7 @@ static void test_get_set(void) void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) { - HRESULT r; + HRESULT r, init_dirty; IShellLinkA *sl; IPersistFile *pf; @@ -451,6 +451,17 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) IPersistFile_GetCurFile(pf, NULL); } + init_dirty = IPersistFile_IsDirty(pf); /* empty links start off as clean */ + r = IPersistFile_Save(pf, NULL, FALSE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == init_dirty, "dirty (0x%08x)\n", r); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == init_dirty, "dirty (0x%08x)\n", r); + /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); @@ -459,6 +470,18 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) r = IPersistFile_Save(pf, path, TRUE); lok(r == S_OK, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == S_FALSE, "dirty (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str);

1 0

Rémi Bernon : include: Rename class parameters to mmcss_class.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3f2e572da8dc9d301d62f2b617e483e1a75557cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2e572da8dc9d301d62f2b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 17:00:54 2021 +0100 include: Rename class parameters to mmcss_class. In MFGetWorkQueueMMCSSClass and Rtwq MMCSS functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 2 +- include/rtworkq.idl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mfapi.h b/include/mfapi.h index 7bac3e21fa9..25602a7cd94 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -538,7 +538,7 @@ HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD format, DWORD width, LONG *stride); HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); -HRESULT WINAPI MFGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length); +HRESULT WINAPI MFGetWorkQueueMMCSSClass(DWORD queue, WCHAR *mmcss_class, DWORD *length); HRESULT WINAPI MFGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority); HRESULT WINAPI MFGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, diff --git a/include/rtworkq.idl b/include/rtworkq.idl index e7ff768074c..32132961bd8 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -92,13 +92,13 @@ cpp_quote("typedef void (WINAPI *RTWQPERIODICCALLBACK)(IUnknown *context);") cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, IUnknown *context, DWORD *key);") cpp_quote("HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") -cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") +cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *mmcss_class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid);") -cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length);") +cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *mmcss_class, DWORD *length);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid);") cpp_quote("HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result);") @@ -109,7 +109,7 @@ cpp_quote("HRESULT WINAPI RtwqLockWorkQueue(DWORD queue);") cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncResult *result, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRegisterPlatformEvents(IRtwqPlatformEvents *events);") -cpp_quote("HRESULT WINAPI RtwqRegisterPlatformWithMMCSS(const WCHAR *class, DWORD *taskid, LONG priority);") +cpp_quote("HRESULT WINAPI RtwqRegisterPlatformWithMMCSS(const WCHAR *mmcss_class, DWORD *taskid, LONG priority);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request);")

1 0

Rémi Bernon : d3d11/tests: Add tests for predicate state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: f0352719582e5269c20d32e28239440e78611e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0352719582e5269c20d32e2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:07 2021 +0100 d3d11/tests: Add tests for predicate state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5212776cc59..d7a49f4af3a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6797,9 +6797,11 @@ static void test_device_context_state(void) enum D3D_PRIMITIVE_TOPOLOGY topo; ID3D11ComputeShader *tmp_cs, *cs; D3D11_DEPTH_STENCIL_DESC ds_desc; + ID3D11Predicate *tmp_pred, *pred; ID3D11DomainShader *tmp_ds, *ds; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; + D3D11_QUERY_DESC predicate_desc; ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; ID3D11PixelShader *tmp_ps, *ps; @@ -6814,6 +6816,7 @@ static void test_device_context_state(void) float blend_factor[4]; struct vec4 constant; DWORD data_size; + BOOL pred_value; ULONG refcount; char data[64]; HRESULT hr; @@ -7020,6 +7023,10 @@ static void test_device_context_state(void) vp.MinDepth = 0.f; vp.MaxDepth = 0.01f; + predicate_desc.Query = D3D11_QUERY_OCCLUSION_PREDICATE; + predicate_desc.MiscFlags = 0; + ID3D11Device1_CreatePredicate(device, &predicate_desc, &pred); + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); @@ -7067,6 +7074,7 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetState(context, rs); ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + ID3D11DeviceContext1_SetPredication(context, pred, TRUE); previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); @@ -7257,6 +7265,13 @@ static void test_device_context_state(void) todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + todo_wine ok(!tmp_pred, "Got unexpected predicate %p.\n", tmp_pred); + if (tmp_pred) ID3D11Predicate_Release(tmp_pred); + todo_wine ok(!pred_value, "Got unexpected predicate value %d.\n", pred_value); + /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -7537,6 +7552,13 @@ static void test_device_context_state(void) ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + ok(tmp_pred == pred, "Got predicate %p, expected %p.\n", tmp_pred, pred); + ID3D11Predicate_Release(tmp_pred); + ok(pred_value == TRUE, "Got predicate value %#x, expected TRUE.\n", pred_value); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -7759,6 +7781,7 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetState(context, rs); ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + ID3D11DeviceContext1_SetPredication(context, pred, TRUE); tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; ID3D11DeviceContext1_RSGetState(context, &tmp_rs); @@ -7778,6 +7801,13 @@ static void test_device_context_state(void) todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + todo_wine ok(!tmp_pred, "Got unexpected predicate %p.\n", tmp_pred); + if (tmp_pred) ID3D11Predicate_Release(tmp_pred); + todo_wine ok(!pred_value, "Got unexpected predicate value %d.\n", pred_value); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -7970,9 +8000,17 @@ static void test_device_context_state(void) ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + ok(tmp_pred == pred, "Got predicate %p, expected %p.\n", tmp_pred, pred); + ID3D11Predicate_Release(tmp_pred); + ok(pred_value == TRUE, "Got predicate value %#x, expected TRUE.\n", pred_value); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11Predicate_Release(pred); ID3D11Buffer_Release(sob); ID3D11RasterizerState_Release(rs); ID3D11BlendState_Release(bs);

1 0

Rémi Bernon : d3d11/tests: Add tests for stream output state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 5b89dfa2806b0c7566b36dbffaedf4af3774053d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b89dfa2806b0c7566b36dbf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:06 2021 +0100 d3d11/tests: Add tests for stream output state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63a98f5099a..5212776cc59 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6777,8 +6777,8 @@ static void test_device_context_state(void) }; ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; - UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref, count; - ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *tmp_cb, *tmp_ib, *tmp_vb; + UINT ib_offset, vb_offset, vb_stride, so_offset, offset, stride, sample_mask, stencil_ref, count; + ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *sob, *tmp_cb, *tmp_ib, *tmp_vb, *tmp_sob; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; ID3D11SamplerState *sampler, *tmp_sampler; @@ -6882,6 +6882,7 @@ static void test_device_context_state(void) uavb = create_buffer((ID3D11Device *)device, D3D11_BIND_UNORDERED_ACCESS, 1024, NULL); ib = create_buffer((ID3D11Device *)device, D3D11_BIND_INDEX_BUFFER, 1024, NULL); vb = create_buffer((ID3D11Device *)device, D3D11_BIND_VERTEX_BUFFER, 1024, NULL); + sob = create_buffer((ID3D11Device *)device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -6942,6 +6943,7 @@ static void test_device_context_state(void) ib_offset = 16; vb_offset = 16; vb_stride = 16; + so_offset = 16; texture_desc.Width = 512; texture_desc.Height = 512; @@ -7064,6 +7066,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); ID3D11DeviceContext1_RSSetState(context, rs); + ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); @@ -7248,6 +7252,11 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); + if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -7523,6 +7532,11 @@ static void test_device_context_state(void) ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); + ID3D11Buffer_Release(tmp_sob); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -7744,6 +7758,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); ID3D11DeviceContext1_RSSetState(context, rs); + ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; ID3D11DeviceContext1_RSGetState(context, &tmp_rs); todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); @@ -7757,6 +7773,11 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); + if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -7944,9 +7965,15 @@ static void test_device_context_state(void) ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); + ID3D11Buffer_Release(tmp_sob); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11Buffer_Release(sob); ID3D11RasterizerState_Release(rs); ID3D11BlendState_Release(bs); ID3D11DepthStencilState_Release(dss);

1 0

Rémi Bernon : d3d11/tests: Add tests for rasterizer stage state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 62ea34c569c34efcb0992141737e272f08c8e0e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ea34c569c34efcb0992141… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:05 2021 +0100 d3d11/tests: Add tests for rasterizer stage state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 103 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 29f8f124686..63a98f5099a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -280,6 +280,13 @@ static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } +static char const *debugstr_viewport(D3D11_VIEWPORT *vp) +{ + if (!vp) return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}", + vp->TopLeftX, vp->TopLeftY, vp->Width, vp->Height, vp->MinDepth, vp->MaxDepth); +} + struct srv_desc { DXGI_FORMAT format; @@ -6770,7 +6777,7 @@ static void test_device_context_state(void) }; ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; - UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref; + UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref, count; ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *tmp_cb, *tmp_ib, *tmp_vb; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; @@ -6784,6 +6791,7 @@ static void test_device_context_state(void) ID3D11RenderTargetView *tmp_rtv, *rtv; ID3D11DepthStencilView *tmp_dsv, *dsv; ID3D11VertexShader *tmp_vs, *vs, *vs2; + ID3D11RasterizerState *tmp_rs, *rs; D3D11_TEXTURE2D_DESC texture_desc; ID3D11GeometryShader *tmp_gs, *gs; enum D3D_PRIMITIVE_TOPOLOGY topo; @@ -6795,8 +6803,11 @@ static void test_device_context_state(void) ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; ID3D11PixelShader *tmp_ps, *ps; + D3D11_RASTERIZER_DESC rs_desc; ID3D11BlendState *tmp_bs, *bs; ID3D11HullShader *tmp_hs, *hs; + D3D11_VIEWPORT tmp_vp[2], vp; + D3D11_RECT tmp_rect[2], rect; D3D11_BLEND_DESC blend_desc; ID3D11Texture2D *texture; enum DXGI_FORMAT format; @@ -6986,6 +6997,27 @@ static void test_device_context_state(void) hr = ID3D11Device1_CreateDepthStencilState(device, &ds_desc, &dss); ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = TRUE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device1_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + SetRect(&rect, 0, 0, 1, 2); + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 3; + vp.Height = 4; + vp.MinDepth = 0.f; + vp.MaxDepth = 0.01f; + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); @@ -7028,6 +7060,10 @@ static void test_device_context_state(void) ID3D11DeviceContext1_OMSetDepthStencilState(context, dss, 3); ID3D11DeviceContext1_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &rtv, dsv, 1, 1, &ps_uav, NULL); + ID3D11DeviceContext1_RSSetScissorRects(context, 1, &rect); + ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext1_RSSetState(context, rs); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); @@ -7199,6 +7235,19 @@ static void test_device_context_state(void) if (tmp_dss) ID3D11DepthStencilState_Release(tmp_dss); todo_wine ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + if (tmp_rs) ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + todo_wine ok(count == 0, "Got unexpected viewport count %u.\n", count); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -7457,6 +7506,23 @@ static void test_device_context_state(void) ID3D11DepthStencilState_Release(tmp_dss); ok(stencil_ref == 3, "Got stencil ref %#x, expected 3.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + ok(tmp_rs == rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + ok(count == 1, "Got viewport count %u, expected 1.\n", count); + ok(!memcmp(tmp_vp, &vp, sizeof(vp)), "Got viewport %s, expected %s.\n", + debugstr_viewport(tmp_vp), debugstr_viewport(&vp)); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", + wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -7674,6 +7740,23 @@ static void test_device_context_state(void) if (tmp_dss) ID3D11DepthStencilState_Release(tmp_dss); todo_wine ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); + ID3D11DeviceContext1_RSSetScissorRects(context, 1, &rect); + ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext1_RSSetState(context, rs); + + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + if (tmp_rs) ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + todo_wine ok(count == 0, "Got unexpected viewport count %u.\n", count); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -7844,9 +7927,27 @@ static void test_device_context_state(void) ID3D11DepthStencilState_Release(tmp_dss); ok(stencil_ref == 3, "Got stencil ref %#x, expected 3.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + ok(tmp_rs == rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + ok(count == 1, "Got viewport count %u, expected 1.\n", count); + ok(!memcmp(tmp_vp, &vp, sizeof(vp)), "Got viewport %s, expected %s.\n", + debugstr_viewport(tmp_vp), debugstr_viewport(&vp)); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", + wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11RasterizerState_Release(rs); ID3D11BlendState_Release(bs); ID3D11DepthStencilState_Release(dss); ID3D11DepthStencilView_Release(dsv);

1 0

Rémi Bernon : d3d11/tests: Add tests for output merger stage state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 1bbf750847463278ba9fc4f7013c0583d48e4141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bbf750847463278ba9fc4f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:04 2021 +0100 d3d11/tests: Add tests for output merger stage state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 214 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 204 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bbf750847463278ba9f…

1 0

Rémi Bernon : d3d11/tests: Add tests for input assembler stage state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3d077ce705fac9d6b709cfc5b6440120aa1897f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d077ce705fac9d6b709cfc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:03 2021 +0100 d3d11/tests: Add tests for input assembler stage state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d077ce705fac9d6b709…

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
92
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 February 2021