November 2019 - Wine-Devel - list.winehq.org

[PATCH] crypt32: Fix a typo in comment.
by Andrey Gusev Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/crypt32/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ea96248bd7..f591a5e72e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -922,7 +922,7 @@ typedef struct _CSignedMsgData } CSignedMsgData; /* Constructs the signer handles for the signerIndex'th signer of msg_data. - * Assumes signerIndex is a valid idnex, and that msg_data's info has already + * Assumes signerIndex is a valid index, and that msg_data's info has already * been constructed. */ static BOOL CSignedMsgData_ConstructSignerHandles(CSignedMsgData *msg_data, -- 2.23.0

1 0

[PATCH] sapiaut.idl: Fix a typo.
by Andrey Gusev Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 8f2b1f9a10..4ae4ebe231 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -1956,7 +1956,7 @@ interface ISpeechRecognizer : IDispatch HRESULT State([out,retval] SpeechRecognizerState *state); [propget, id(DISPID_SRStatus)] - HRESULT Status([out,retval] ISpeechRecognizerStatus **satus); + HRESULT Status([out,retval] ISpeechRecognizerStatus **status); [propputref, id(DISPID_SRProfile)] HRESULT Profile([in,defaultvalue(0)] ISpeechObjectToken *profile); -- 2.23.0

1 0

[PATCH vkd3d 1/3] vkd3d: Validate texture resource alignments.
by Conor McCarthy Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 4 +-- libs/vkd3d/resource.c | 56 +++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 59859ad..31d793f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2920,7 +2920,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour desc = &resource_descs[0]; - if (FAILED(d3d12_resource_validate_desc(desc))) + if (FAILED(d3d12_resource_validate_desc(desc, device))) { WARN("Invalid resource desc.\n"); goto invalid; @@ -3226,7 +3226,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (FAILED(d3d12_resource_validate_desc(desc))) + if (FAILED(d3d12_resource_validate_desc(desc, device))) { WARN("Invalid resource desc.\n"); return; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f5cdf4a..6e8c98e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1001,7 +1001,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); - assert(d3d12_resource_validate_desc(desc) == S_OK); + assert(d3d12_resource_validate_desc(desc, device) == S_OK); if (!desc->MipLevels) { @@ -1591,8 +1591,45 @@ static void d3d12_validate_resource_flags(D3D12_RESOURCE_FLAGS flags) FIXME("Ignoring D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER.\n"); } -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) +static bool d3d12_resource_validate_texture_alignment(const D3D12_RESOURCE_DESC *desc, + struct d3d12_device *device, const struct vkd3d_format *format) { + uint64_t estimated_size; + + if (!desc->Alignment) + return true; + + if (desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + && desc->Alignment != D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + && (desc->SampleDesc.Count == 1 || desc->Alignment != D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT)) + { + WARN("Invalid resource alignment %#"PRIx64".\n", desc->Alignment); + return false; + } + + if (desc->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + /* Windows uses the slice size to determine small alignment eligibility. DepthOrArraySize is ignored. */ + estimated_size = desc->Width * desc->Height * format->byte_count * format->block_byte_count + / (format->block_width * format->block_height); + if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + WARN("Invalid resource alignment %#"PRIx64" (required %#x).\n", + desc->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); + return false; + } + } + + /* The size check for MSAA textures with D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT is probably + * not important. The 4MB requirement is no longer universal and Vulkan has no such requirement. */ + + return true; +} + +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) +{ + const struct vkd3d_format *format; + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -1618,10 +1655,17 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) WARN("1D texture with a height of %u.\n", desc->Height); return E_INVALIDARG; } - break; - + /* Fall through. */ case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + { + WARN("Invalid format %#x.\n", desc->Format); + return E_INVALIDARG; + } + + if (!d3d12_resource_validate_texture_alignment(desc, device, format)) + return E_INVALIDARG; break; default: @@ -1631,8 +1675,6 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) d3d12_validate_resource_flags(desc->Flags); - /* FIXME: Validate alignment for textures. */ - return S_OK; } @@ -1703,7 +1745,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->gpu_address = 0; resource->flags = 0; - if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) + if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; switch (desc->Dimension) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index df8d1a1..9ff6bba 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -435,7 +435,7 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour } bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) DECLSPEC_HIDDEN; HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, -- 2.24.0

1 2

[PATCH 1/6] d3d9: Fix a copy-paste error.
by Zebediah Figura Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0657cc2f766..58bdd7458c2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2403,7 +2403,7 @@ static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) if (device->recording) { wined3d_mutex_unlock(); - WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; } -- 2.23.0

3 12

[PATCH v2 1/3] ddraw: Fix conversion of v1 viewport from v2 in d3d_viewport_GetViewport().
by Paul Gofman Nov. 27, 2019

Nov. 27, 2019

Spotted in https://bugs.winehq.org/show_bug.cgi?id=19471. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - remove todo_wine from now successful tests in d3d.c. dlls/ddraw/tests/d3d.c | 26 +++++----- dlls/ddraw/tests/ddraw4.c | 106 ++++++++++++++++++++++++++------------ dlls/ddraw/viewport.c | 13 ++--- 3 files changed, 94 insertions(+), 51 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 64f68fde56..e606010a9c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -991,21 +991,21 @@ static void ViewportTest(void) ret_vp1_data.dwSize = sizeof(vp1_data); hr = IDirect3DViewport2_GetViewport(Viewport2, &ret_vp1_data); - ok(hr == D3D_OK, "IDirect3DViewport2_GetViewport returned %08x\n", hr); - - ok(ret_vp1_data.dwX == vp2_data.dwX, "dwX is %u, expected %u\n", ret_vp1_data.dwX, vp2_data.dwX); - ok(ret_vp1_data.dwY == vp2_data.dwY, "dwY is %u, expected %u\n", ret_vp1_data.dwY, vp2_data.dwY); - ok(ret_vp1_data.dwWidth == vp2_data.dwWidth, "dwWidth is %u, expected %u\n", ret_vp1_data.dwWidth, vp2_data.dwWidth); - ok(ret_vp1_data.dwHeight == vp2_data.dwHeight, "dwHeight is %u, expected %u\n", ret_vp1_data.dwHeight, vp2_data.dwHeight); - ok(ret_vp1_data.dvMaxX == vp1_data.dvMaxX, "dvMaxX is %f, expected %f\n", ret_vp1_data.dvMaxX, vp1_data.dvMaxX); - ok(ret_vp1_data.dvMaxY == vp1_data.dvMaxY, "dvMaxY is %f, expected %f\n", ret_vp1_data.dvMaxY, vp1_data.dvMaxY); - todo_wine ok(ret_vp1_data.dvScaleX == infinity, "dvScaleX is %f, expected %f\n", ret_vp1_data.dvScaleX, infinity); - todo_wine ok(ret_vp1_data.dvScaleY == infinity, "dvScaleY is %f, expected %f\n", ret_vp1_data.dvScaleY, infinity); - todo_wine ok(ret_vp1_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0\n", ret_vp1_data.dvMinZ); - todo_wine ok(ret_vp1_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0\n", ret_vp1_data.dvMaxZ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ok(ret_vp1_data.dwX == vp2_data.dwX, "dwX is %u, expected %u.\n", ret_vp1_data.dwX, vp2_data.dwX); + ok(ret_vp1_data.dwY == vp2_data.dwY, "dwY is %u, expected %u.\n", ret_vp1_data.dwY, vp2_data.dwY); + ok(ret_vp1_data.dwWidth == vp2_data.dwWidth, "dwWidth is %u, expected %u.\n", ret_vp1_data.dwWidth, vp2_data.dwWidth); + ok(ret_vp1_data.dwHeight == vp2_data.dwHeight, "dwHeight is %u, expected %u.\n", ret_vp1_data.dwHeight, vp2_data.dwHeight); + ok(ret_vp1_data.dvMaxX == vp1_data.dvMaxX, "dvMaxX is %f, expected %f.\n", ret_vp1_data.dvMaxX, vp1_data.dvMaxX); + ok(ret_vp1_data.dvMaxY == vp1_data.dvMaxY, "dvMaxY is %f, expected %f.\n", ret_vp1_data.dvMaxY, vp1_data.dvMaxY); + ok(ret_vp1_data.dvScaleX == infinity, "dvScaleX is %f, expected %f.\n", ret_vp1_data.dvScaleX, infinity); + ok(ret_vp1_data.dvScaleY == infinity, "dvScaleY is %f, expected %f.\n", ret_vp1_data.dvScaleY, infinity); + ok(ret_vp1_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0.\n", ret_vp1_data.dvMinZ); + ok(ret_vp1_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0.\n", ret_vp1_data.dvMaxZ); hr = IDirect3DViewport2_SetViewport2(Viewport2, &vp2_data); - ok(hr == D3D_OK, "IDirect3DViewport2_SetViewport2 returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&ret_vp2_data, 0xff, sizeof(ret_vp2_data)); ret_vp2_data.dwSize = sizeof(vp2_data); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e61d67d723..114f4b5ed6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1591,19 +1591,19 @@ static ULONG get_refcount(IUnknown *test_iface) static void test_viewport_object(void) { - IDirectDraw4 *ddraw; - IDirect3D3 *d3d; - HRESULT hr, old_d3d_ref; - ULONG ref; - D3DVIEWPORT vp; - D3DVIEWPORT2 vp2; - IDirect3DViewport *viewport; - IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3, *another_vp, *test_vp; IDirectDrawGammaControl *gamma; + IDirect3DViewport2 *viewport2; + IDirect3DViewport *viewport; + IDirect3DDevice3 *device; + HRESULT hr, old_d3d_ref; + IDirectDraw4 *ddraw; IUnknown *unknown; + D3DVIEWPORT2 vp2; + IDirect3D3 *d3d; + D3DVIEWPORT vp; HWND window; - IDirect3DDevice3 *device; + ULONG ref; union { D3DVIEWPORT2 vp2; @@ -1619,13 +1619,13 @@ static void test_viewport_object(void) return; } hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); old_d3d_ref = get_refcount((IUnknown *) d3d); hr = IDirect3D3_CreateViewport(d3d, &viewport3, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); ok(ref == 1, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)d3d); @@ -1654,11 +1654,11 @@ static void test_viewport_object(void) gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport3, &IID_IDirectDrawGammaControl, (void **)&gamma); ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(!gamma, "Interface not set to NULL by failed QI call: %p\n", gamma); + ok(!gamma, "Interface not set to NULL by failed QI call: %p.\n", gamma); /* NULL iid: Segfaults */ hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport, (void **)&viewport); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); @@ -1667,7 +1667,7 @@ static void test_viewport_object(void) viewport = NULL; hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport3, (void **)&viewport2); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport2); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); @@ -1675,7 +1675,7 @@ static void test_viewport_object(void) IDirect3DViewport3_Release(viewport2); hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IUnknown, (void **)&unknown); - ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount(unknown); @@ -1688,7 +1688,7 @@ static void test_viewport_object(void) ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_CreateViewport(d3d, &another_vp, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); /* Setting a viewport not in the viewport list fails */ hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); @@ -1696,21 +1696,21 @@ static void test_viewport_object(void) /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice3_AddViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3DDevice3_AddViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 2, "Got unexpected refcount %u.\n", ref); test_vp = (IDirect3DViewport3 *) 0xbaadc0de; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(test_vp == (IDirect3DViewport3 *) 0xbaadc0de, "Got unexpected pointer %p\n", test_vp); + ok(test_vp == (IDirect3DViewport3 *) 0xbaadc0de, "Got unexpected pointer %p.\n", test_vp); hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) device); @@ -1718,8 +1718,8 @@ static void test_viewport_object(void) test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(test_vp == viewport3, "Got unexpected viewport %p.\n", test_vp); ref = get_refcount((IUnknown *) viewport3); ok(ref == 4, "Got unexpected refcount %u.\n", ref); if (test_vp) @@ -1729,17 +1729,17 @@ static void test_viewport_object(void) /* Cannot set the viewport to NULL */ hr = IDirect3DDevice3_SetCurrentViewport(device, NULL); - ok(hr == DDERR_INVALIDPARAMS, "Failed to set viewport to NULL, hr %#x.\n", hr); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(test_vp == viewport3, "Got unexpected viewport %p.\n", test_vp); if (test_vp) IDirect3DViewport3_Release(test_vp); /* SetCurrentViewport properly releases the old viewport's reference */ hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); @@ -1748,7 +1748,7 @@ static void test_viewport_object(void) /* Unlike device2::DeleteViewport, device3::DeleteViewport releases the * reference held by SetCurrentViewport */ hr = IDirect3DDevice3_DeleteViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 1, "Got unexpected refcount %u.\n", ref); @@ -1756,11 +1756,11 @@ static void test_viewport_object(void) test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(!test_vp, "Got unexpected viewport %p\n", test_vp); + ok(!test_vp, "Got unexpected viewport %p.\n", test_vp); /* Setting a different viewport doesn't have any surprises now */ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); @@ -1790,10 +1790,52 @@ static void test_viewport_object(void) vp.dwSize = sizeof(vp); hr = IDirect3DViewport3_SetViewport(viewport3, &vp); - ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); vp2.dwSize = sizeof(vp2); hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); - ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + vp2.dwSize = sizeof(vp2); + vp2.dwX = 160; + vp2.dwY = 120; + vp2.dwWidth = 640 - vp2.dwX; + vp2.dwHeight = 480 - vp2.dwY; + vp2.dvClipX = 2.0f; + vp2.dvClipY = -1.75f; + vp2.dvClipWidth = 2.5f; + vp2.dvClipHeight = -1.5f; + vp2.dvMinZ = 0.5f; + vp2.dvMaxZ = 2.0f; + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_GetViewport(viewport3, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == 4.5f && vp.dvMaxY == -1.75f && vp.dvScaleX == 192.0f + && vp.dvScaleY == -240.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); + + vp2.dvClipX = -1.5f; + vp2.dvClipY = 1.75f; + vp2.dvClipWidth = -1.5f; + vp2.dvClipHeight = 2.0f; + vp2.dvMinZ = 2.0f; + vp2.dvMaxZ = 0.5f; + + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_GetViewport(viewport3, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == -3.0f && vp.dvMaxY == 1.75f && vp.dvScaleX == -320.0f + && vp.dvScaleY == 180.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); /* Destroying the device removes the viewport and releases the reference */ IDirect3DDevice3_Release(device); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 5fc7a4b2be..ceb5582524 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -350,12 +350,13 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE vp1.dwY = viewport->viewports.vp2.dwY; vp1.dwWidth = viewport->viewports.vp2.dwWidth; vp1.dwHeight = viewport->viewports.vp2.dwHeight; - vp1.dvMaxX = 0.0f; - vp1.dvMaxY = 0.0f; - vp1.dvScaleX = 0.0f; - vp1.dvScaleY = 0.0f; - vp1.dvMinZ = viewport->viewports.vp2.dvMinZ; - vp1.dvMaxZ = viewport->viewports.vp2.dvMaxZ; + + vp1.dvScaleX = vp1.dwWidth / viewport->viewports.vp2.dvClipWidth; + vp1.dvScaleY = vp1.dwHeight / viewport->viewports.vp2.dvClipHeight; + vp1.dvMaxX = viewport->viewports.vp2.dvClipWidth + viewport->viewports.vp2.dvClipX; + vp1.dvMaxY = viewport->viewports.vp2.dvClipY; + vp1.dvMinZ = 0.0f; + vp1.dvMaxZ = 1.0f; memcpy(vp, &vp1, size); } -- 2.23.0

3 7

[PATCH] d3dcompiler/tests: Fix a copy-paste error.
by Sven Baars Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/d3dcompiler_43/tests/reflection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 810eac8936..f8c97230d6 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -434,7 +434,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) @@ -459,7 +459,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -741,7 +741,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) @@ -772,7 +772,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -1009,7 +1009,7 @@ static void test_reflection_desc_ps_output(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "(%u): GetOutputParameterDesc ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "(%u): GetOutputParameterDesc Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); count = ref11->lpVtbl->Release(ref11); ok(count == 0, "(%u): Release failed %u\n", i, count); -- 2.17.1

2 1

[PATCH 1/3] comctl32/combo: Simplify rectangles sizing helper.
by Nikolay Sivov Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/combo.c | 163 ++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 108 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 599817aed4..57fddefc93 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -307,111 +307,70 @@ static void CBForceDummyResize( * * Set up component coordinates given valid lphc->RectCombo. */ -static void CBCalcPlacement( - HWND hwnd, - LPHEADCOMBO lphc, - LPRECT lprEdit, - LPRECT lprButton, - LPRECT lprLB) +static void CBCalcPlacement(HEADCOMBO *combo) { - /* - * Again, start with the client rectangle. - */ - GetClientRect(hwnd, lprEdit); + /* Start with the client rectangle. */ + GetClientRect(combo->self, &combo->textRect); - /* - * Remove the borders - */ - InflateRect(lprEdit, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); + /* Remove the borders */ + InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); - /* - * Chop off the bottom part to fit with the height of the text area. - */ - lprEdit->bottom = lprEdit->top + CBGetTextAreaHeight(hwnd, lphc); + /* Chop off the bottom part to fit with the height of the text area. */ + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo); - /* - * The button starts the same vertical position as the text area. - */ - CopyRect(lprButton, lprEdit); + /* The button starts the same vertical position as the text area. */ + combo->buttonRect = combo->textRect; - /* - * If the combobox is "simple" there is no button. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - lprButton->left = lprButton->right = lprButton->bottom = 0; - else - { - /* - * Let's assume the combobox button is the same width as the - * scrollbar button. - * size the button horizontally and cut-off the text area. - */ - lprButton->left = lprButton->right - GetSystemMetrics(SM_CXVSCROLL); - lprEdit->right = lprButton->left; - } + /* If the combobox is "simple" there is no button. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) + combo->buttonRect.left = combo->buttonRect.right = combo->buttonRect.bottom = 0; + else + { + /* + * Let's assume the combobox button is the same width as the + * scrollbar button. + * size the button horizontally and cut-off the text area. + */ + combo->buttonRect.left = combo->buttonRect.right - GetSystemMetrics(SM_CXVSCROLL); + combo->textRect.right = combo->buttonRect.left; + } - /* - * In the case of a dropdown, there is an additional spacing between the - * text area and the button. - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - { - lprEdit->right -= COMBO_EDITBUTTONSPACE(); - } + /* In the case of a dropdown, there is an additional spacing between the text area and the button. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->textRect.right -= COMBO_EDITBUTTONSPACE(); - /* - * If we have an edit control, we space it away from the borders slightly. - */ - if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) - { - InflateRect(lprEdit, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - } + /* If we have an edit control, we space it away from the borders slightly. */ + if (CB_GETTYPE(combo) != CBS_DROPDOWNLIST) + InflateRect(&combo->textRect, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - /* - * Adjust the size of the listbox popup. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - { - /* - * Use the client rectangle to initialize the listbox rectangle - */ - GetClientRect(hwnd, lprLB); - - /* - * Then, chop-off the top part. - */ - lprLB->top = lprEdit->bottom + COMBO_YBORDERSIZE(); - } - else - { - /* - * Make sure the dropped width is as large as the combobox itself. - */ - if (lphc->droppedWidth < (lprButton->right + COMBO_XBORDERSIZE())) + /* Adjust the size of the listbox popup. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) { - lprLB->right = lprLB->left + (lprButton->right + COMBO_XBORDERSIZE()); - - /* - * In the case of a dropdown, the popup listbox is offset to the right. - * so, we want to make sure it's flush with the right side of the - * combobox - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - lprLB->right -= COMBO_EDITBUTTONSPACE(); + GetClientRect(combo->self, &combo->droppedRect); + combo->droppedRect.top = combo->textRect.bottom + COMBO_YBORDERSIZE(); } else - lprLB->right = lprLB->left + lphc->droppedWidth; - } - - /* don't allow negative window width */ - if (lprEdit->right < lprEdit->left) - lprEdit->right = lprEdit->left; + { + /* Make sure the dropped width is as large as the combobox itself. */ + if (combo->droppedWidth < (combo->buttonRect.right + COMBO_XBORDERSIZE())) + { + combo->droppedRect.right = combo->droppedRect.left + (combo->buttonRect.right + COMBO_XBORDERSIZE()); - TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); + /* In the case of a dropdown, the popup listbox is offset to the right. We want to make sure it's flush + with the right side of the combobox */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->droppedRect.right -= COMBO_EDITBUTTONSPACE(); + } + else + combo->droppedRect.right = combo->droppedRect.left + combo->droppedWidth; + } - TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); + /* Disallow negative window width */ + if (combo->textRect.right < combo->textRect.left) + combo->textRect.right = combo->textRect.left; - TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); + TRACE("text %s, button %s, lbox %s.\n", wine_dbgstr_rect(&combo->textRect), wine_dbgstr_rect(&combo->buttonRect), + wine_dbgstr_rect(&combo->droppedRect)); } /*********************************************************************** @@ -472,7 +431,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * recalculated. */ GetClientRect( hwnd, &lphc->droppedRect ); - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* * Adjust the position of the popup listbox if it's necessary @@ -1472,11 +1431,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1504,11 +1459,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1537,11 +1488,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -2049,7 +1996,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam lphc->droppedWidth = 0; /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* fall through */ case CB_GETDROPPEDWIDTH: -- 2.24.0

1 2

[PATCH v3] vkd3d: Add test case for SM 5.1 register spaces.
by Hans-Kristian Arntzen Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- tests/d3d12.c | 380 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 380 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e8a6261..85b0454 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32356,6 +32356,385 @@ static void test_bufinfo_instruction(void) destroy_test_context(&context); } +static void test_register_space_sm51(void) +{ + ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_ROOT_PARAMETER root_parameters[2]; + + ID3D12Resource *input_buffers[8]; + ID3D12Resource* input_buffer_counter; + ID3D12Resource *textures[2]; + + struct resource_readback rb; + + D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + unsigned int i, descriptor_size; + D3D12_SAMPLER_DESC sampler_desc; + D3D12_SUBRESOURCE_DATA data; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + unsigned int counter_value; + + static const DWORD cs_code[] = + { +#if 0 + cbuffer CBuf : register(b1, space1) + { + float4 cbuffer_data; + }; + + Buffer<float4> Buf : register(t1, space2); + ByteAddressBuffer AddrBuf : register(t1, space3); + StructuredBuffer<float4> StructuredBuf : register(t1, space4); + RWBuffer<float4> RWBuf : register(u1, space5); + RWByteAddressBuffer RWAddrBuf : register(u1, space6); + RWStructuredBuffer<float4> RWStructuredBuf : register(u1, space7); + RWStructuredBuffer<float4> RWStructuredBufResult : register(u1, space8); + + Texture2D<float4> Tex : register(t1, space9); + RWTexture2D<float> RWTex : register(u1, space10); + SamplerState Samp : register(s1, space11); + + [numthreads(1, 1, 1)] + void main() + { + float4 res = 1.0.xxxx; + + res *= cbuffer_data; + res *= Buf[0]; + res *= asfloat(AddrBuf.Load4(0)); + res *= StructuredBuf[0]; + res *= RWBuf[0]; + res *= asfloat(RWAddrBuf.Load4(0)); + res *= RWStructuredBuf[0]; + + res *= Tex.SampleLevel(Samp, float2(0.5, 0.5), 0.0).xxxx; + res *= RWTex[int2(0, 0)].xxxx; + + RWStructuredBuf.IncrementCounter(); + RWStructuredBufResult[0] = res; + } +#endif + 0x43425844, 0x70f33bd3, 0x11527a3b, 0x08c5298b, 0x28a1f88e, 0x00000001, 0x00000434, 0x00000004, + 0x00000030, 0x00000040, 0x00000050, 0x00000424, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000003cc, 0x00050051, 0x000000f3, + 0x0100086a, 0x07000059, 0x00308e46, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x0600005a, 0x00306e46, 0x00000000, 0x00000001, 0x00000001, 0x0000000b, 0x07000858, 0x00307e46, + 0x00000000, 0x00000001, 0x00000001, 0x00005555, 0x00000002, 0x060000a1, 0x00307e46, 0x00000001, + 0x00000001, 0x00000001, 0x00000003, 0x070000a2, 0x00307e46, 0x00000002, 0x00000001, 0x00000001, + 0x00000010, 0x00000004, 0x07001858, 0x00307e46, 0x00000003, 0x00000001, 0x00000001, 0x00005555, + 0x00000009, 0x0700089c, 0x0031ee46, 0x00000000, 0x00000001, 0x00000001, 0x00005555, 0x00000005, + 0x0600009d, 0x0031ee46, 0x00000001, 0x00000001, 0x00000001, 0x00000006, 0x0780009e, 0x0031ee46, + 0x00000002, 0x00000001, 0x00000001, 0x00000010, 0x00000007, 0x0700009e, 0x0031ee46, 0x00000003, + 0x00000001, 0x00000001, 0x00000010, 0x00000008, 0x0700189c, 0x0031ee46, 0x00000004, 0x00000001, + 0x00000001, 0x00005555, 0x0000000a, 0x02000068, 0x00000002, 0x0400009b, 0x00000001, 0x00000001, + 0x00000001, 0x0b00002d, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00207e46, 0x00000000, 0x00000001, 0x09000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00308e46, 0x00000000, 0x00000001, 0x00000000, 0x080000a5, 0x001000f2, 0x00000001, + 0x00004001, 0x00000000, 0x00207e46, 0x00000001, 0x00000001, 0x07000038, 0x001000f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a0000a7, 0x001000f2, 0x00000001, 0x00004001, + 0x00000000, 0x00004001, 0x00000000, 0x00207e46, 0x00000002, 0x00000001, 0x07000038, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0b0000a3, 0x001000f2, 0x00000001, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0021ee46, 0x00000000, 0x00000001, + 0x07000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x080000a5, + 0x001000f2, 0x00000001, 0x00004001, 0x00000000, 0x0021ee46, 0x00000001, 0x00000001, 0x07000038, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a0000a7, 0x001000f2, + 0x00000001, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x0021ee46, 0x00000002, 0x00000001, + 0x07000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x10000048, + 0x00100012, 0x00000001, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00207e46, + 0x00000003, 0x00000001, 0x00206000, 0x00000000, 0x00000001, 0x00004001, 0x00000000, 0x07000038, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100006, 0x00000001, 0x0b0000a3, 0x00100012, + 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0021ee46, 0x00000004, + 0x00000001, 0x07000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100006, 0x00000001, + 0x060000b2, 0x00100012, 0x00000001, 0x0021e000, 0x00000002, 0x00000001, 0x0a0000a8, 0x0021e0f2, + 0x00000003, 0x00000001, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e, 0x30494653, 0x00000008, 0x00000800, 0x00000000, + }; + + static const D3D12_DESCRIPTOR_RANGE_TYPE range_types[] = { + /* CBV<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_CBV, + /* Buffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* ByteAddressBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* StructuredBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* RWBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* RWByteAddressBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* RWStructuredBuffer<> with atomic counter */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* RWStructuredBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* Texture<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* RWTexture<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* SamplerState */ + D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, + }; + + static const float buffer_data[ARRAY_SIZE(range_types) - 1][D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT / sizeof(float)] = { + { 2.0f, 2.0f, 2.0f, 2.0f }, + { 3.0f, 3.0f, 3.0f, 3.0f }, + { 4.0f, 4.0f, 4.0f, 4.0f }, + { 5.0f, 5.0f, 5.0f, 5.0f }, + { 6.0f, 6.0f, 6.0f, 6.0f }, + { 7.0f, 7.0f, 7.0f, 7.0f }, + { 8.0f, 8.0f, 8.0f, 8.0f }, + { 9.0f, 9.0f, 9.0f, 9.0f }, + { 10.0f, 10.0f, 10.0f, 10.0f }, + { 11.0f, 11.0f, 11.0f, 11.0f }, + }; + + static const uint8_t zero_data[D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT] = { 0 }; + + D3D12_DESCRIPTOR_RANGE descriptor_range[ARRAY_SIZE(range_types)]; + + if (!init_compute_test_context(&context)) + return; + command_list = context.list; + queue = context.queue; + + root_signature_desc.NumParameters = 2; + root_signature_desc.Flags = 0; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.pParameters = root_parameters; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[0].DescriptorTable.NumDescriptorRanges = ARRAY_SIZE(range_types) - 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0]; + + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[1].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[ARRAY_SIZE(range_types) - 1]; + + memset(descriptor_range, 0, sizeof(descriptor_range)); + + for (i = 0; i < ARRAY_SIZE(range_types); i++) + { + descriptor_range[i].NumDescriptors = 1; + descriptor_range[i].BaseShaderRegister = 1; + descriptor_range[i].RegisterSpace = i + 1; + descriptor_range[i].OffsetInDescriptorsFromTableStart = (i != ARRAY_SIZE(range_types) - 1) ? i : 0; + descriptor_range[i].RangeType = range_types[i]; + } + + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + + context.pipeline_state = create_compute_pipeline_state(context.device, + context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, ARRAY_SIZE(range_types) - 1); + sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1); + + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP; + sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP; + sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP; + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(sampler_heap); + ID3D12Device_CreateSampler(context.device, &sampler_desc, cpu_handle); + + descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(context.device, + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + /* CBV<> */ + input_buffers[0] = create_default_buffer(context.device, sizeof(buffer_data[0]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* Buffer<> */ + input_buffers[1] = create_default_buffer(context.device, sizeof(buffer_data[1]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* ByteAddressBuffer<> */ + input_buffers[2] = create_default_buffer(context.device, sizeof(buffer_data[2]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* StructuredBuffer<> */ + input_buffers[3] = create_default_buffer(context.device, sizeof(buffer_data[3]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* RWBuffer<> */ + input_buffers[4] = create_default_buffer(context.device, sizeof(buffer_data[4]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + /* RWByteAddressBuffer<> */ + input_buffers[5] = create_default_buffer(context.device, sizeof(buffer_data[5]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + /* RWStructuredBuffer<> with counter */ + input_buffers[6] = create_default_buffer(context.device, sizeof(buffer_data[6]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + input_buffer_counter = create_default_buffer(context.device, sizeof(buffer_data[6]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + /* RWStructuredBuffer<> without counter */ + input_buffers[7] = create_default_buffer(context.device, sizeof(buffer_data[7]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + textures[0] = create_default_texture2d(context.device, 1, 1, 1, 1, DXGI_FORMAT_R32_FLOAT, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + textures[1] = create_default_texture2d(context.device, 1, 1, 1, 1, DXGI_FORMAT_R32_FLOAT, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + + /* CBV<> */ + cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(input_buffers[0]); + cbv_desc.SizeInBytes = sizeof(buffer_data[0]); + ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* Buffer<> */ + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_NONE; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1; + srv_desc.Buffer.StructureByteStride = 0; + ID3D12Device_CreateShaderResourceView(context.device, input_buffers[1], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* ByteAddressBuffer<> */ + srv_desc.Format = DXGI_FORMAT_R32_TYPELESS; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 4; + srv_desc.Buffer.StructureByteStride = 0; + ID3D12Device_CreateShaderResourceView(context.device, input_buffers[2], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* StructuredBuffer<> */ + srv_desc.Format = DXGI_FORMAT_UNKNOWN; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_NONE; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1; + srv_desc.Buffer.StructureByteStride = 16; + ID3D12Device_CreateShaderResourceView(context.device, input_buffers[3], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWBuffer<> */ + uav_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = 1; + uav_desc.Buffer.StructureByteStride = 0; + uav_desc.Buffer.CounterOffsetInBytes = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[4], NULL, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWByteAddressBuffer<> */ + uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW; + uav_desc.Buffer.StructureByteStride = 0; + uav_desc.Buffer.NumElements = 4; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[5], NULL, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWStructuredBuffer<> with counter */ + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.StructureByteStride = 16; + uav_desc.Buffer.NumElements = 1; + uav_desc.Buffer.CounterOffsetInBytes = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[6], input_buffer_counter, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWStructuredBuffer<> without counter */ + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.StructureByteStride = 16; + uav_desc.Buffer.NumElements = 1; + uav_desc.Buffer.CounterOffsetInBytes = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[7], NULL, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* Texture */ + srv_desc.Format = DXGI_FORMAT_R32_FLOAT; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MipLevels = 1; + srv_desc.Texture2D.MostDetailedMip = 0; + srv_desc.Texture2D.PlaneSlice = 0; + srv_desc.Texture2D.ResourceMinLODClamp = 0; + ID3D12Device_CreateShaderResourceView(context.device, textures[0], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWTexture */ + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D; + uav_desc.Format = DXGI_FORMAT_R32_FLOAT; + uav_desc.Texture2D.MipSlice = 0; + uav_desc.Texture2D.PlaneSlice = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, textures[1], NULL, &uav_desc, cpu_handle); + + for (i = 0; i < 8; i++) + { + upload_buffer_data(input_buffers[i], 0, sizeof(buffer_data[i]), buffer_data[i], queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_buffers[i], D3D12_RESOURCE_STATE_COPY_DEST, + i < 4 ? D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE : D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + } + + for (i = 0; i < 2; i++) + { + D3D12_SUBRESOURCE_DATA sub; + sub.pData = buffer_data[8 + i]; + sub.RowPitch = D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT / 4; + sub.SlicePitch = 0; + upload_texture_data(textures[i], &sub, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, textures[i], D3D12_RESOURCE_STATE_COPY_DEST, + i == 0 ? D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE : D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + } + + upload_buffer_data(input_buffer_counter, 0, sizeof(zero_data), zero_data, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_buffer_counter, D3D12_RESOURCE_STATE_COPY_DEST, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + heaps[0] = heap; heaps[1] = sampler_heap; + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 1, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + get_buffer_readback_with_command_list(input_buffers[7], DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < 4; i++) + { + /* Start value of 9 is for the StructuredBuffer we write to. */ + float reference = 2 * 3 * 4 * 5 * 6 * 7 * 8 * 10 * 11; + ok(get_readback_float(&rb, i, 0) == reference, "Readback value is: %f\n", get_readback_float(&rb, i, 0)); + } + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + counter_value = read_uav_counter(&context, input_buffer_counter, 0); + ok(counter_value == 1, "Atomic counter is %u.\n", counter_value); + + for (i = 0; i < 8; i++) + ID3D12Resource_Release(input_buffers[i]); + for (i = 0; i < 2; i++) + ID3D12Resource_Release(textures[i]); + ID3D12Resource_Release(input_buffer_counter); + ID3D12DescriptorHeap_Release(heap); + ID3D12DescriptorHeap_Release(sampler_heap); + destroy_test_context(&context); +} + START_TEST(d3d12) { pfn_D3D12CreateDevice = get_d3d12_pfn(D3D12CreateDevice); @@ -32521,4 +32900,5 @@ START_TEST(d3d12) run_test(test_early_depth_stencil_tests); run_test(test_conditional_rendering); run_test(test_bufinfo_instruction); + run_test(test_register_space_sm51); } -- 2.24.0

3 3

[PATCH resend 1/3] ntdll: Fix tick count calculation on Mac.
by Chip Davis Nov. 27, 2019

Nov. 27, 2019

Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/ntdll/time.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 754dbe8b36e..2a049909a65 100644 --- a/configure.ac +++ b/configure.ac @@ -2206,6 +2206,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b879..4e3d5583c7b 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; -- 2.21.0

4 8

[PATCH 1/4] user32/combo: Remove unnecessary argument from button painting helper.
by Nikolay Sivov Nov. 27, 2019

Nov. 27, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/combo.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 40ff0ef521..52d2f7190d 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -574,10 +574,13 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * * Paint combo button (normal, pressed, and disabled states). */ -static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) +static void CBPaintButton(HEADCOMBO *lphc, HDC hdc) { UINT buttonState = DFCS_SCROLLCOMBOBOX; + if (IsRectEmpty(&lphc->buttonRect)) + return; + if( lphc->wState & CBF_NOREDRAW ) return; @@ -588,7 +591,7 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) if (CB_DISABLED(lphc)) buttonState |= DFCS_INACTIVE; - DrawFrameControl(hdc, &rectButton, DFC_SCROLL, buttonState); + DrawFrameControl(hdc, &lphc->buttonRect, DFC_SCROLL, buttonState); } /*********************************************************************** @@ -816,11 +819,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) * In non 3.1 look, there is a sunken border on the combobox */ CBPaintBorder(lphc->self, lphc, hDC); - - if( !IsRectEmpty(&lphc->buttonRect) ) - { - CBPaintButton(lphc, hDC, lphc->buttonRect); - } + CBPaintButton(lphc, hDC); /* paint the edit control padding area */ if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) -- 2.24.0

1 3