- Wine-Devel - list.winehq.org

[PATCH vkd3d 3/6] vkd3d: Use the resource's stored format in vkd3d_create_image().
by Conor McCarthy Jan. 19, 2022

Jan. 19, 2022

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b376ecd2..a2be9a81 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -855,7 +855,11 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, VkImageCreateInfo image_info; VkResult vr; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + if (resource) + { + format = resource->format; + } + else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid DXGI format %#x.\n", desc->Format); return E_INVALIDARG; -- 2.34.1

2 1

[PATCH vkd3d v2 1/6] vkd3d: Store the vkd3d format in resource objects.
by Conor McCarthy Jan. 19, 2022

Jan. 19, 2022

Resource formats are immutable and the format object is static data. Storing it saves a function call and error check in many locations. The current implementation for finding a format iterates over the entire list of formats. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 9 +-------- libs/vkd3d/resource.c | 3 +++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3e252aee..9ac2bb9f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2116,17 +2116,10 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; - const struct vkd3d_format *format; VkImageMemoryBarrier barrier; assert(d3d12_resource_is_texture(resource)); - if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) - { - ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); - return; - } - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -2146,7 +2139,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = resource->u.vk_image; - barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; barrier.subresourceRange.baseMipLevel = 0; barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; barrier.subresourceRange.baseArrayLayer = 0; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78b32bde..b376ecd2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1778,6 +1778,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; + resource->format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0); + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -2030,6 +2032,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; + object->format = vkd3d_format_from_d3d12_resource_desc(d3d12_device, &create_info->desc, 0); object->u.vk_image = create_info->vk_image; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 047f4a29..6c31467f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -427,6 +427,7 @@ struct d3d12_resource LONG internal_refcount; D3D12_RESOURCE_DESC desc; + const struct vkd3d_format *format; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; union -- 2.34.1

2 3

[PATCH] msvcrt: Fix Pi contants while computing acosf.
by Piotr Caban Jan. 19, 2022

Jan. 19, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcrt: Add support for demangling char{8,16,32}_t types.
by Piotr Caban Jan. 19, 2022

Jan. 19, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/undname.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH] mfplat: Implement MFTGetInfo().
by Nikolay Sivov Jan. 19, 2022

Jan. 19, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 153 ++++++++++++++++++++++++++++++++++--- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 61 +++++++++++++-- include/mfapi.h | 2 + 4 files changed, 203 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f36c960f852..e2f892ed91d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -631,7 +631,7 @@ static const BYTE guid_conv_table[256] = 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ }; -static WCHAR* GUIDToString(WCHAR *str, REFGUID guid) +static WCHAR* guid_to_string(WCHAR *str, REFGUID guid) { swprintf(str, 39, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], @@ -706,7 +706,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 WCHAR str[250]; UINT8 *blob; - GUIDToString(buffer, clsid); + guid_to_string(buffer, clsid); swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) @@ -767,8 +767,8 @@ static HRESULT register_category(CLSID *clsid, GUID *category) WCHAR guid1[64], guid2[64]; WCHAR str[350]; - GUIDToString(guid1, category); - GUIDToString(guid2, clsid); + guid_to_string(guid1, category); + guid_to_string(guid2, clsid); swprintf(str, ARRAY_SIZE(str), L"%s\\%s\\%s", categories_keyW, guid1, guid2); @@ -1030,7 +1030,7 @@ static BOOL mft_is_type_info_match(struct mft_registration *mft, const GUID *cat return matching; } -static void mft_get_reg_type_info(const WCHAR *clsidW, const WCHAR *typeW, MFT_REGISTER_TYPE_INFO **type, +static void mft_get_reg_type_info_internal(const WCHAR *clsidW, const WCHAR *typeW, MFT_REGISTER_TYPE_INFO **type, UINT32 *count) { HKEY htransform, hfilter; @@ -1109,7 +1109,7 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, if (RegOpenKeyW(HKEY_CLASSES_ROOT, categories_keyW, &hcategory)) return E_FAIL; - GUIDToString(clsidW, category); + guid_to_string(clsidW, category); ret = RegOpenKeyW(hcategory, clsidW, &hlist); RegCloseKey(hcategory); if (ret) @@ -1126,10 +1126,10 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, mft_get_reg_flags(clsidW, L"MFTFlags", &mft.flags); if (output_type) - mft_get_reg_type_info(clsidW, L"OutputTypes", &mft.output_types, &mft.output_types_count); + mft_get_reg_type_info_internal(clsidW, L"OutputTypes", &mft.output_types, &mft.output_types_count); if (input_type) - mft_get_reg_type_info(clsidW, L"InputTypes", &mft.input_types, &mft.input_types_count); + mft_get_reg_type_info_internal(clsidW, L"InputTypes", &mft.input_types, &mft.input_types_count); if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { @@ -1416,7 +1416,7 @@ HRESULT WINAPI MFTUnregister(CLSID clsid) TRACE("(%s)\n", debugstr_guid(&clsid)); - GUIDToString(buffer, &clsid); + guid_to_string(buffer, &clsid); if (!RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &htransform)) { @@ -1442,6 +1442,141 @@ HRESULT WINAPI MFTUnregister(CLSID clsid) return S_OK; } +static HRESULT mft_get_name(HKEY hkey, WCHAR **name) +{ + DWORD size; + + if (!name) + return S_OK; + + *name = NULL; + + if (!RegQueryValueExW(hkey, NULL, NULL, NULL, NULL, &size)) + { + if (!(*name = CoTaskMemAlloc(size))) + return E_OUTOFMEMORY; + + RegQueryValueExW(hkey, NULL, NULL, NULL, (BYTE *)*name, &size); + } + + return S_OK; +} + +static HRESULT mft_get_reg_type_info(const WCHAR *clsid, const WCHAR *key, MFT_REGISTER_TYPE_INFO **ret_types, + UINT32 *ret_count) +{ + MFT_REGISTER_TYPE_INFO *types = NULL; + UINT32 count = 0; + + if (!ret_types) + return S_OK; + + mft_get_reg_type_info_internal(clsid, key, &types, &count); + if (count) + { + if (!(*ret_types = CoTaskMemAlloc(count * sizeof(**ret_types)))) + { + free(types); + return E_OUTOFMEMORY; + } + + memcpy(*ret_types, types, count * sizeof(**ret_types)); + *ret_count = count; + } + + free(types); + + return S_OK; +} + +static HRESULT mft_get_attributes(HKEY hkey, IMFAttributes **ret) +{ + IMFAttributes *attributes; + UINT8 *blob; + DWORD size; + HRESULT hr; + + if (!ret) + return S_OK; + + if (FAILED(hr = MFCreateAttributes(&attributes, 0))) + return hr; + + if (!RegQueryValueExW(hkey, L"Attributes", NULL, NULL, NULL, &size) && size) + { + if (!(blob = malloc(size))) + { + IMFAttributes_Release(attributes); + return E_OUTOFMEMORY; + } + + if (!RegQueryValueExW(hkey, L"Attributes", NULL, NULL, blob, &size)) + { + if (FAILED(hr = MFInitAttributesFromBlob(attributes, blob, size))) + WARN("Failed to initialize attributes, hr %#x.\n", hr); + } + + free(blob); + } + + if (SUCCEEDED(hr)) + { + *ret = attributes; + IMFAttributes_AddRef(*ret); + } + + IMFAttributes_Release(attributes); + + return hr; +} + +/*********************************************************************** + * MFTGetInfo (mfplat.@) + */ +HRESULT WINAPI MFTGetInfo(CLSID clsid, WCHAR **name, MFT_REGISTER_TYPE_INFO **input_types, + UINT32 *input_types_count, MFT_REGISTER_TYPE_INFO **output_types, UINT32 *output_types_count, + IMFAttributes **attributes) +{ + HRESULT hr = S_OK; + WCHAR clsidW[64]; + HKEY hroot, hmft; + DWORD ret; + + TRACE("%s, %p, %p, %p, %p, %p, %p.\n", debugstr_guid(&clsid), name, input_types, + input_types_count, output_types, output_types_count, attributes); + + guid_to_string(clsidW, &clsid); + + if ((ret = RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &hroot))) + return HRESULT_FROM_WIN32(ret); + + ret = RegOpenKeyW(hroot, clsidW, &hmft); + RegCloseKey(hroot); + if (ret) + return HRESULT_FROM_WIN32(ret); + + if (input_types_count) + *input_types_count = 0; + + if (output_types_count) + *output_types_count = 0; + + hr = mft_get_name(hmft, name); + + if (SUCCEEDED(hr)) + hr = mft_get_reg_type_info(clsidW, L"InputTypes", input_types, input_types_count); + + if (SUCCEEDED(hr)) + hr = mft_get_reg_type_info(clsidW, L"OutputTypes", output_types, output_types_count); + + if (SUCCEEDED(hr)) + hr = mft_get_attributes(hmft, attributes); + + RegCloseKey(hmft); + + return hr; +} + /*********************************************************************** * MFStartup (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 6cc3fb07105..44d98a957e2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -160,7 +160,7 @@ @ stdcall MFTEnum(int128 long ptr ptr ptr ptr ptr) @ stdcall MFTEnum2(int128 long ptr ptr ptr ptr ptr) @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) -@ stub MFTGetInfo +@ stdcall MFTGetInfo(int128 ptr ptr ptr ptr ptr ptr) @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) @ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stdcall MFTRegisterLocalByCLSID(ptr ptr wstr long long ptr long ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21eab6d1172..207bd61b8dc 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -396,6 +396,7 @@ static BOOL check_clsid(CLSID *clsids, UINT32 count) static void test_register(void) { + MFT_REGISTER_TYPE_INFO *in_types, *out_types; WCHAR name[] = L"Wine test"; MFT_REGISTER_TYPE_INFO input[] = { @@ -405,17 +406,19 @@ static void test_register(void) { { DUMMY_CLSID, DUMMY_GUID2 } }; + UINT32 count, in_count, out_count; + IMFAttributes *attributes; + WCHAR *mft_name; CLSID *clsids; - UINT32 count; - HRESULT ret; + HRESULT hr, ret; ret = MFTRegister(DUMMY_CLSID, MFT_CATEGORY_OTHER, name, 0, 1, input, 1, output, NULL); if (ret == E_ACCESSDENIED) { - win_skip("Not enough permissions to register a filter\n"); + win_skip("Not enough permissions to register a transform.\n"); return; } - ok(ret == S_OK, "Failed to register dummy filter: %x\n", ret); + ok(ret == S_OK, "Failed to register dummy transform, hr %#x.\n", ret); if(0) { @@ -445,6 +448,49 @@ if(0) ret = MFTEnum(MFT_CATEGORY_OTHER, 0, NULL, NULL, NULL, &clsids, NULL); ok(ret == E_POINTER, "Failed to enumerate filters: %x\n", ret); } + hr = MFTGetInfo(DUMMY_CLSID, &mft_name, NULL, NULL, NULL, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(mft_name, L"Wine test"), "Unexpected name %s.\n", wine_dbgstr_w(mft_name)); + CoTaskMemFree(mft_name); + + hr = MFTGetInfo(DUMMY_CLSID, NULL, NULL, NULL, NULL, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + in_count = out_count = 1; + hr = MFTGetInfo(DUMMY_CLSID, NULL, NULL, &in_count, NULL, &out_count, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!in_count, "Unexpected count %u.\n", in_count); + ok(!out_count, "Unexpected count %u.\n", out_count); + + hr = MFTGetInfo(DUMMY_CLSID, NULL, NULL, NULL, NULL, NULL, &attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!attributes, "Unexpected attributes.\n"); + IMFAttributes_Release(attributes); + + hr = MFTGetInfo(DUMMY_CLSID, &mft_name, &in_types, &in_count, &out_types, &out_count, &attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(mft_name, L"Wine test"), "Unexpected name %s.\n", wine_dbgstr_w(mft_name)); + ok(!!in_types, "Unexpected pointer.\n"); + ok(!!out_types, "Unexpected pointer.\n"); + ok(in_count == 1, "Unexpected count %u.\n", in_count); + ok(out_count == 1, "Unexpected count %u.\n", out_count); + ok(IsEqualGUID(&in_types->guidMajorType, &DUMMY_CLSID), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&in_types->guidMajorType)); + ok(IsEqualGUID(&in_types->guidSubtype, &DUMMY_GUID1), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&in_types->guidSubtype)); + ok(IsEqualGUID(&out_types->guidMajorType, &DUMMY_CLSID), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&out_types->guidMajorType)); + ok(IsEqualGUID(&out_types->guidSubtype, &DUMMY_GUID2), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&out_types->guidSubtype)); + ok(!!attributes, "Unexpected attributes.\n"); + count = 1; + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + CoTaskMemFree(mft_name); + CoTaskMemFree(in_types); + CoTaskMemFree(out_types); + IMFAttributes_Release(attributes); count = 0; clsids = NULL; @@ -5213,9 +5259,11 @@ static const IClassFactoryVtbl test_mft_factory_vtbl = static void test_MFTRegisterLocal(void) { IClassFactory test_factory = { &test_mft_factory_vtbl }; - MFT_REGISTER_TYPE_INFO input_types[1]; + MFT_REGISTER_TYPE_INFO input_types[1], *in_types, *out_types; + IMFAttributes *attributes; IMFActivate **activate; UINT32 count, count2; + WCHAR *name; HRESULT hr; if (!pMFTRegisterLocal) @@ -5255,6 +5303,9 @@ static void test_MFTRegisterLocal(void) 0, NULL); ok(hr == S_OK, "Failed to register MFT, hr %#x.\n", hr); + hr = MFTGetInfo(MFT_CATEGORY_OTHER, &name, &in_types, &count, &out_types, &count2, &attributes); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + hr = pMFTUnregisterLocal(NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/mfapi.h b/include/mfapi.h index bcb5d26121e..5b60833f529 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -558,6 +558,8 @@ HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); +HRESULT WINAPI MFTGetInfo(CLSID clsid, WCHAR **name, MFT_REGISTER_TYPE_INFO **input_types, UINT32 *input_types_count, + MFT_REGISTER_TYPE_INFO **output_types, UINT32 *output_types_count, IMFAttributes **attributes); BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); -- 2.34.1

1 0

[PATCH 1/2] d3d11: Implement ID3D11RasterizerState1.
by Zebediah Figura Jan. 19, 2022

Jan. 19, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 7 ++-- dlls/d3d11/state.c | 68 +++++++++++++++++++++++--------------- dlls/d3d11/tests/d3d11.c | 19 +++++++++++ 4 files changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index afbde9a4bfb..b45ef8431bf 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -461,7 +461,7 @@ struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( /* ID3D11RasterizerState, ID3D10RasterizerState */ struct d3d_rasterizer_state { - ID3D11RasterizerState ID3D11RasterizerState_iface; + ID3D11RasterizerState1 ID3D11RasterizerState1_iface; ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 626e4889708..c0191677e77 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2283,7 +2283,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_RSGetState(ID3D11DeviceContex if ((wined3d_state = wined3d_device_context_get_rasterizer_state(context->wined3d_context))) { rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); - ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); + *rasterizer_state = (ID3D11RasterizerState *)&rasterizer_state_impl->ID3D11RasterizerState1_iface; + ID3D11RasterizerState_AddRef(*rasterizer_state); } else { @@ -3604,7 +3605,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) return hr; - *rasterizer_state = &object->ID3D11RasterizerState_iface; + *rasterizer_state = (ID3D11RasterizerState *)&object->ID3D11RasterizerState1_iface; return S_OK; } @@ -4950,7 +4951,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D rasterizer_state_object = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); d3d11_device_context_RSSetState(&device->immediate_context.ID3D11DeviceContext1_iface, - rasterizer_state_object ? &rasterizer_state_object->ID3D11RasterizerState_iface : NULL); + rasterizer_state_object ? (ID3D11RasterizerState *)&rasterizer_state_object->ID3D11RasterizerState1_iface : NULL); } static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 810217c93b4..9aa841f0805 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -841,23 +841,24 @@ struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10De /* ID3D11RasterizerState methods */ -static inline struct d3d_rasterizer_state *impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) +static inline struct d3d_rasterizer_state *impl_from_ID3D11RasterizerState1(ID3D11RasterizerState1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D11RasterizerState_iface); + return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D11RasterizerState1_iface); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11RasterizerState1 *iface, REFIID riid, void **object) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11RasterizerState) + || IsEqualGUID(riid, &IID_ID3D11RasterizerState1) || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D11RasterizerState_AddRef(iface); + ID3D11RasterizerState1_AddRef(iface); *object = iface; return S_OK; } @@ -876,9 +877,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11Ras return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerState1 *iface) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); ULONG refcount = InterlockedIncrement(&state->refcount); TRACE("%p increasing refcount to %u.\n", state, refcount); @@ -892,9 +893,9 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta return refcount; } -static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerState1 *iface) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -909,10 +910,10 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt return refcount; } -static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerState *iface, +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerState1 *iface, ID3D11Device **device) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -920,47 +921,58 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerS ID3D11Device_AddRef(*device); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_GetPrivateData(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_GetPrivateData(ID3D11RasterizerState1 *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return d3d_get_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateData(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateData(ID3D11RasterizerState1 *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return d3d_set_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface(ID3D11RasterizerState1 *iface, REFGUID guid, const IUnknown *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); return d3d_set_private_data_interface(&state->private_store, guid, data); } -static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState *iface, +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState1 *iface, D3D11_RASTERIZER_DESC *desc) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, desc %p.\n", iface, desc); *desc = state->desc; } -static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc1(ID3D11RasterizerState1 *iface, + D3D11_RASTERIZER_DESC1 *desc) +{ + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + memcpy(desc, &state->desc, sizeof(state->desc)); + desc->ForcedSampleCount = 0; +} + +static const struct ID3D11RasterizerState1Vtbl d3d11_rasterizer_state_vtbl = { /* IUnknown methods */ d3d11_rasterizer_state_QueryInterface, @@ -973,6 +985,8 @@ static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = d3d11_rasterizer_state_SetPrivateDataInterface, /* ID3D11RasterizerState methods */ d3d11_rasterizer_state_GetDesc, + /* ID3D11RasterizerState1 methods */ + d3d11_rasterizer_state_GetDesc1, }; /* ID3D10RasterizerState methods */ @@ -991,7 +1005,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return d3d11_rasterizer_state_QueryInterface(&state->ID3D11RasterizerState_iface, riid, object); + return d3d11_rasterizer_state_QueryInterface(&state->ID3D11RasterizerState1_iface, riid, object); } static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) @@ -1000,7 +1014,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta TRACE("iface %p.\n", iface); - return d3d11_rasterizer_state_AddRef(&state->ID3D11RasterizerState_iface); + return d3d11_rasterizer_state_AddRef(&state->ID3D11RasterizerState1_iface); } static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) @@ -1009,7 +1023,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt TRACE("iface %p.\n", state); - return d3d11_rasterizer_state_Release(&state->ID3D11RasterizerState_iface); + return d3d11_rasterizer_state_Release(&state->ID3D11RasterizerState1_iface); } /* ID3D10DeviceChild methods */ @@ -1113,7 +1127,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str struct wined3d_rasterizer_state_desc wined3d_desc; HRESULT hr; - state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; + state->ID3D11RasterizerState1_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; wined3d_private_store_init(&state->private_store); @@ -1175,7 +1189,7 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); TRACE("Returning existing rasterizer state %p.\n", object); - ID3D11RasterizerState_AddRef(&object->ID3D11RasterizerState_iface); + ID3D11RasterizerState1_AddRef(&object->ID3D11RasterizerState1_iface); *state = object; wined3d_mutex_unlock(); @@ -1207,9 +1221,9 @@ struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11Raster { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d11_rasterizer_state_vtbl); + assert(iface->lpVtbl == (ID3D11RasterizerStateVtbl *)&d3d11_rasterizer_state_vtbl); - return impl_from_ID3D11RasterizerState(iface); + return impl_from_ID3D11RasterizerState1((ID3D11RasterizerState1 *)iface); } struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 55a245c744c..cd4905e2a82 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5507,6 +5507,7 @@ static void test_create_rasterizer_state(void) D3D10_RASTERIZER_DESC d3d10_desc; D3D11_RASTERIZER_DESC desc; ID3D11Device *device, *tmp; + ID3D11Device1 *device1; HRESULT hr; if (!(device = create_device(NULL))) @@ -5570,6 +5571,24 @@ static void test_create_rasterizer_state(void) ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); } + if (ID3D11Device_QueryInterface(device, &IID_ID3D11Device1, (void **)&device1) == S_OK) + { + ID3D11RasterizerState1 *state_ex1; + D3D11_RASTERIZER_DESC1 desc1; + + hr = ID3D11RasterizerState_QueryInterface(rast_state1, &IID_ID3D11RasterizerState1, (void **)&state_ex1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&desc1, 0xcc, sizeof(desc1)); + ID3D11RasterizerState1_GetDesc1(state_ex1, &desc1); + ok(!memcmp(&desc1, &desc, sizeof(desc)), "D3D11 desc didn't match.\n"); + ok(!desc1.ForcedSampleCount, "Got forced sample count %u.\n", desc1.ForcedSampleCount); + + ID3D11RasterizerState1_Release(state_ex1); + + ID3D11Device1_Release(device1); + } + refcount = ID3D11RasterizerState_Release(rast_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = ID3D11RasterizerState_Release(rast_state1); -- 2.34.1

3 5

[PATCH v2] dxgi: Allow sampling of Vulkan swapchain images for D3D12.
by Conor McCarthy Jan. 19, 2022

Jan. 19, 2022

Psychonauts 2 creates an SRV on a swapchain image, and lack of VK_IMAGE_USAGE_SAMPLED_BIT results in failure to create a Vulkan SRV descriptor. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8d5f2f537..0bc1ba4f4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1304,6 +1304,8 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + if (swapchain->desc.BufferUsage & DXGI_USAGE_SHADER_INPUT) + image_info.usage |= VK_IMAGE_USAGE_SAMPLED_BIT; image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; image_info.queueFamilyIndexCount = 0; image_info.pQueueFamilyIndices = NULL; @@ -1794,6 +1796,12 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) WARN("Transfer not supported for swapchain images.\n"); + if (swapchain->desc.BufferUsage & DXGI_USAGE_SHADER_INPUT) + { + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_SAMPLED_BIT; + if (!(usage & VK_IMAGE_USAGE_SAMPLED_BIT)) + WARN("Sampling not supported for swapchain images.\n"); + } vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; vk_swapchain_desc.pNext = NULL; @@ -3087,8 +3095,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IDXGIOutput_Release(output); } - if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) - FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage); + if (swapchain_desc->BufferUsage & ~(DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT)) + FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage & ~(DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT)); if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH && swapchain_desc->Scaling != DXGI_SCALING_NONE) FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) -- 2.34.1

3 2

[PATCH] d3d11/tests: Disable cross-device ContextState tests.
by Stefan Dösinger Jan. 19, 2022

Jan. 19, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51103 Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 151 +++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 68 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 55a245c744c..d3bf7fefcf2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7396,74 +7396,88 @@ static void test_device_context_state(void) refcount = ID3D11VertexShader_Release(tmp_vs); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - /* context states may be used with other devices instances too */ - d3d11_device2 = create_device(NULL); - ok(!!d3d11_device2, "Failed to create device.\n"); - hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); - ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); - ID3D11Device_Release(d3d11_device2); - ID3D11Device1_GetImmediateContext1(device2, &context2); - ok(!!context2, "Failed to get immediate context.\n"); - - /* but they track a distinct state on each context */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); - ok(!!tmp_context_state, "Failed to get context state.\n"); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - /* updating context2 vertex shader doesn't update other contexts using the same state */ - ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); - ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); - refcount = ID3DDeviceContextState_Release(tmp_context_state); - ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); - refcount = ID3DDeviceContextState_Release(context_state2); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - ok(context_state2 == context_state, "Got unexpected state pointer.\n"); - - /* swapping the default state on context2 effectively clears the vertex shader */ - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); - ok(!!tmp_context_state, "Failed to get context state.\n"); - refcount = ID3DDeviceContextState_Release(tmp_context_state); - ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); - - /* clearing the vertex shader on context doesn't have side effect on context2 */ - ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); - refcount = ID3D11VertexShader_Release(vs2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - /* even after swapping it again */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - /* swapping the initial state on context2 doesn't have side effect on context either */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - refcount = ID3D11DeviceContext1_Release(context2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3D11Device1_Release(device2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + /* context states may be used with other devices instances too + * + * Or at least, no error is returned right away. Using objects like shaders + * from other device instances causes a segfault later on Nvidia Windows + * drivers. This suggests the feature tested below is more a bug than a + * feature. + * + * The tests below suggest that a ContextState object stores its own state + * for every device it is used with. This isn't entirely true, e.g. the + * primitive topology can be transfered between devices, but will cause odd + * refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 + * references on the context's device for example). */ + if (0) + { + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + /* but they track a distinct state on each context */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + /* updating context2 vertex shader doesn't update other contexts using the same state */ + ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + /* swapping the default state on context2 effectively clears the vertex shader */ + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + + /* clearing the vertex shader on context doesn't have side effect on context2 */ + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = get_refcount(vs2); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* even after swapping it again */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* swapping the initial state on context2 doesn't have side effect on context either */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + } ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); @@ -8132,6 +8146,7 @@ static void test_device_context_state(void) if (hs) ID3D11HullShader_Release(hs); ID3D11PixelShader_Release(ps); ID3D11GeometryShader_Release(gs); + ID3D11VertexShader_Release(vs2); ID3D11VertexShader_Release(vs); ID3D11Buffer_Release(cb); ID3D11ShaderResourceView_Release(srv); -- 2.24.3 (Apple Git-128)

3 2

Regarding WinRT and external libraries
by Bernhard Kölbl Jan. 19, 2022

Jan. 19, 2022

Hello everyone, I have recently started to (try) working on the implementation of WinRT speech recognition (Windows.Media.Speech), which seems to be mainly used by a few games right now (e.g. Phasmophobia). I already finished working on the IDLs, and stubs for the most needed interfaces. The first hurdles weren't really hard to solve, but now, as I'm not the most experience Wine dev and WinRT isn't such a big thing in Wine yet, I came across a few issues that I'd like to discuss: *What are the plans on handling the reuse of common COM-objects across different WinRT dlls? E.g. Creating a vtable for something like IVector<HSTRING>, every time it's used in different DLLs, seems counterproductive and creates unneeded redundant code, because it always provides the same functionality. *What are the requirements for external libraries to be used in Wine? I thought of using something like VOSK or Mozilla DeepSpeech for voice recognition. Would those be acceptable? Bernhard

2 1

[PATCH vkd3d v3 8/8] tests: Test initializer argument flattening.
by Francisco Casas Jan. 19, 2022

Jan. 19, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-flatten.shader_test | 70 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 tests/hlsl-initializer-flatten.shader_test diff --git a/Makefile.am b/Makefile.am index f09a9434..3f71acba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ @@ -297,6 +298,7 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl-initializer-flatten.shader_test new file mode 100644 index 00000000..4fd71da7 --- /dev/null +++ b/tests/hlsl-initializer-flatten.shader_test @@ -0,0 +1,70 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aa = {1, float2(2, 3), 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1, 2, 3, 4) + + +[pixel shader] +struct stu { + int3 aa; + float4 bb; +}; + +float4 main() : sv_target +{ + struct stu foo = {1, 2, float2(3, 4), int3(5, 6, 7)}; + return foo.bb; +} + +[test] +draw quad +probe all rgba (4, 5, 6, 7) + + +[pixel shader] +float4 main() : sv_target +{ + int4 aa = {10, 20, 30, 40}; + float4 foo[3] = {1, aa, aa, 2, 3, 4}; + return foo[1]; +} + +[test] +draw quad +probe all rgba (40, 10, 20, 30) + + +[pixel shader] +struct stu { + float aa; + int bb; +}; + +float4 main() : sv_target +{ + struct stu foo = {2.0, 3}; + float4 f = {1.0, foo, 4.0}; + return f; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +float4 main() : sv_target +{ + int arr[3] = {2, 3, 4}; + float4 f = {1.0, arr}; + return f; +} +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) -- 2.25.1

1 0