October 2018 - Wine-devel - list.winehq.org

[PATCH] comctl32: Avoid an unneeded lstrlenW() call.
by Francois Gouget 22 Oct '18

22 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It seems wasteful to compute the length of the string when all we care about is the first character. Plus the 'if (*str)' pattern is pretty common and used extensively in Wine already. dlls/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 6a51ad7fc17..ec3b49890fd 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2435,7 +2435,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) btnInfo->btn = nmtb.tbButton; if (!(nmtb.tbButton.fsStyle & BTNS_SEP)) { - if (lstrlenW(nmtb.pszText)) + if (*nmtb.pszText) lstrcpyW(btnInfo->text, nmtb.pszText); else if (nmtb.tbButton.iString >= 0 && nmtb.tbButton.iString < infoPtr->nNumStrings) -- 2.19.1

3 3

[PATCH] kernel32: Add GetProcessMitigationPolicy() stub.
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 52120dd143..afd44dfe1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -786,6 +786,7 @@ @ stdcall GetProcessId(long) @ stdcall GetProcessIdOfThread(long) @ stdcall GetProcessIoCounters(long ptr) +@ stdcall GetProcessMitigationPolicy(long long ptr long) # @ stub GetProcessPreferredUILanguages @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f9456aeb49..c3dc113803 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4701,3 +4701,13 @@ BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY policy, void *b return TRUE; } + +/********************************************************************** + * GetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI GetProcessMitigationPolicy(HANDLE hProcess, PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length) +{ + FIXME("(%p, %u, %p, %lu): stub\n", hProcess, policy, buffer, length); + + return TRUE; +} -- 2.19.1

2 1

[PATCH] powrprof: Add PowerDeterminePlatformRoleEx() stub.
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 1597d96f58..d870fe2ebd 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -321,6 +321,12 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) return PlatformRoleDesktop; } +POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRoleEx(ULONG version) +{ + FIXME("%u stub.\n", version); + return PlatformRoleDesktop; +} + DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, ULONG index, UCHAR *buffer, DWORD *buffer_size) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index a9e337a0e4..169219ad1a 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerDeterminePlatformRole () +@ stdcall PowerDeterminePlatformRoleEx(long) @ stdcall PowerEnumerate(long ptr ptr long long ptr ptr) @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) -- 2.19.1

1 0

[PATCH 1/2] kernel32/tests: Remove workarounds for SearchPath().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/path.c | 64 ++++++++++++++------------------------ 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca1cbf30ec..ad8a34296a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -70,8 +70,6 @@ static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); -static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); -static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); @@ -1812,24 +1810,18 @@ static void test_SearchPathA(void) HANDLE handle; DWORD ret; - if (!pSearchPathA) - { - win_skip("SearchPathA isn't available\n"); - return; - } - GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); /* NULL filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1845,38 +1837,38 @@ static void test_SearchPathA(void) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); ret = pActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too */ - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); ok(strcmp(buffA, path2A), "got wrong path %s, %s\n", buffA, path2A); @@ -1902,23 +1894,17 @@ static void test_SearchPathW(void) HANDLE handle; DWORD ret; - if (!pSearchPathW) - { - win_skip("SearchPathW isn't available\n"); - return; - } - if (0) { /* NULL filename, crashes on nt4 */ - pSearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); } GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + ret = SearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1934,15 +1920,15 @@ if (0) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret && ret == lstrlenW(path2W), "got %d\n", ret); /* full path, name without 'dll' extension */ GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); - ret = pSearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret == 0, "got %d\n", ret); GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); @@ -1951,33 +1937,33 @@ if (0) ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too, meaning it takes precedence over normal search order */ - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ok(lstrcmpW(buffW, path2W), "got wrong path %s, %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(path2W)); /* path is built using on manifest file name */ - ret = pSearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ret = pDeactivateActCtx(0, cookie); @@ -2118,8 +2104,6 @@ static void init_pointers(void) MAKEFUNC(GetLongPathNameW); MAKEFUNC(NeedCurrentDirectoryForExePathA); MAKEFUNC(NeedCurrentDirectoryForExePathW); - MAKEFUNC(SearchPathA); - MAKEFUNC(SearchPathW); MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW); -- 2.19.1

1 1

[PATCH] dxgi: Support IID_IDXGIDevice in dxgi_adapter_CheckInterfaceSupport().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/adapter.c | 3 ++- dlls/dxgi/tests/dxgi.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 4bc57a244d..0079759568 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -218,7 +218,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); /* This method works only for D3D10 interfaces. */ - if (!(IsEqualGUID(guid, &IID_ID3D10Device) + if (!(IsEqualGUID(guid, &IID_IDXGIDevice) + || IsEqualGUID(guid, &IID_ID3D10Device) || IsEqualGUID(guid, &IID_ID3D10Device1))) { WARN("Returning DXGI_ERROR_UNSUPPORTED for %s.\n", debugstr_guid(guid)); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f2bc9ed229..bd5c574ec8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -838,6 +838,10 @@ static void test_check_interface_support(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, &driver_version); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, &driver_version); -- 2.19.1

3 2

[PATCH vkd3d 7/7] vkd3d-shader: Implement SV_ViewportArrayIndex.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 06abe65a58fe..0813f49516aa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2942,6 +2942,12 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com case SpvBuiltInLayer: vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); break; + case SpvBuiltInViewportIndex: + vkd3d_spirv_enable_capability(builder, SpvCapabilityMultiViewport); + break; + case SpvBuiltInSampleId: + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + break; default: break; } @@ -3012,14 +3018,6 @@ static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } -static uint32_t sv_sample_index(struct vkd3d_dxbc_compiler *compiler, uint32_t id) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); - return id; -} - struct vkd3d_spirv_builtin { enum vkd3d_component_type component_type; @@ -3049,10 +3047,11 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, + {VKD3D_SIV_VIEWPORT_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInViewportIndex}}, {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, - {VKD3D_SIV_SAMPLE_INDEX, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleId, sv_sample_index}}, + {VKD3D_SIV_SAMPLE_INDEX, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleId}}, {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, -- 2.18.1

2 1

[PATCH vkd3d 6/7] vkd3d-shader: Try to always use combined samplers for t# registers.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> For bufinfo and resinfo. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3186c2c3c9a3..06abe65a58fe 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5484,21 +5484,17 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg, unsigned int flags) { - const struct vkd3d_symbol *symbol = NULL, *combined_sampler = NULL; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t sampler_var_id, sampler_id, sampled_image_type_id; - bool load, depth_comparison; + const struct vkd3d_symbol *symbol = NULL; + bool load, sampled, depth_comparison; load = !(flags & VKD3D_IMAGE_FLAG_NO_LOAD); + sampled = flags & VKD3D_IMAGE_FLAG_SAMPLED; depth_comparison = flags & VKD3D_IMAGE_FLAG_DEPTH; - if (flags & VKD3D_IMAGE_FLAG_SAMPLED) - { - assert(load); - combined_sampler = vkd3d_dxbc_compiler_find_combined_sampler(compiler, - resource_reg, sampler_reg); - symbol = combined_sampler; - } + if (resource_reg->type == VKD3DSPR_RESOURCE) + symbol = vkd3d_dxbc_compiler_find_combined_sampler(compiler, resource_reg, sampler_reg); if (!symbol) symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); @@ -5509,13 +5505,13 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil image->structure_stride = symbol->info.resource.structure_stride; image->raw = symbol->info.resource.raw; - if (combined_sampler) + if (symbol->type == VKD3D_SYMBOL_COMBINED_SAMPLER) { sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); image->sampled_image_id = vkd3d_spirv_build_op_load(builder, sampled_image_type_id, image->id, SpvMemoryAccessMaskNone); - image->image_id = vkd3d_spirv_build_op_image(builder, - image->image_type_id, image->sampled_image_id); + image->image_id = !sampled ? vkd3d_spirv_build_op_image(builder, + image->image_type_id, image->sampled_image_id) : 0; return; } @@ -5526,8 +5522,10 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil resource_reg, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); - if (flags & VKD3D_IMAGE_FLAG_SAMPLED) + if (sampled) { + assert(image->image_id); + if (sampler_reg) sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); else -- 2.18.1

2 1

[PATCH vkd3d 5/7] vkd3d-shader: Add support for combined samplers.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 15 +++ libs/vkd3d-shader/spirv.c | 164 +++++++++++++++++++++++++++++++-- libs/vkd3d/state.c | 4 + 3 files changed, 175 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index ce8de6dad388..ac163583b65a 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -91,6 +91,18 @@ struct vkd3d_shader_resource_binding struct vkd3d_shader_descriptor_binding binding; }; +#define VKD3D_DUMMY_SAMPLER_INDEX ~0u + +struct vkd3d_shader_combined_resource_sampler +{ + unsigned int resource_index; + unsigned int sampler_index; + enum vkd3d_shader_visibility shader_visibility; + bool is_buffer; + + struct vkd3d_shader_descriptor_binding binding; +}; + struct vkd3d_shader_uav_counter_binding { unsigned int register_index; /* u# */ @@ -116,6 +128,9 @@ struct vkd3d_shader_interface const struct vkd3d_shader_push_constant_buffer *push_constant_buffers; unsigned int push_constant_buffer_count; + const struct vkd3d_shader_combined_resource_sampler *combined_samplers; + unsigned int combined_sampler_count; + /* A sampler used by OpImageFetches generated for SM4 ld instructions. * * In Vulkan OpImageFetch must be used with a sampled image. diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e964cce24677..3186c2c3c9a3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1676,6 +1676,12 @@ struct vkd3d_symbol_resource unsigned int idx; }; +struct vkd3d_symbol_combined_sampler +{ + unsigned int resource_idx; + unsigned int sampler_idx; +}; + struct vkd3d_symbol_register_data { SpvStorageClass storage_class; @@ -1703,12 +1709,14 @@ struct vkd3d_symbol { VKD3D_SYMBOL_REGISTER, VKD3D_SYMBOL_RESOURCE, + VKD3D_SYMBOL_COMBINED_SAMPLER, } type; union { struct vkd3d_symbol_register reg; struct vkd3d_symbol_resource resource; + struct vkd3d_symbol_combined_sampler combined_sampler; } key; uint32_t id; @@ -1757,6 +1765,15 @@ static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, symbol->key.resource.idx = reg->idx[0].offset; } +static void vkd3d_symbol_make_combined_sampler(struct vkd3d_symbol *symbol, + unsigned int resource_index, unsigned int sampler_index) +{ + symbol->type = VKD3D_SYMBOL_COMBINED_SAMPLER; + memset(&symbol->key, 0, sizeof(symbol->key)); + symbol->key.combined_sampler.resource_idx = resource_index; + symbol->key.combined_sampler.sampler_idx = sampler_index; +} + static struct vkd3d_symbol *vkd3d_symbol_dup(const struct vkd3d_symbol *symbol) { struct vkd3d_symbol *s; @@ -2009,6 +2026,31 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ return NULL; } +static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) +{ + const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_combined_resource_sampler *combined_sampler; + unsigned int i; + + if (!shader_interface->combined_sampler_count) + return false; + + if (resource && resource->type == VKD3DSPR_UAV) + return false; + + for (i = 0; i < shader_interface->combined_sampler_count; ++i) + { + combined_sampler = &shader_interface->combined_samplers[i]; + + if (!(resource || combined_sampler->resource_index == resource->idx[0].offset) + && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) + return true; + } + + return false; +} + static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) @@ -3753,6 +3795,9 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; + if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, NULL, reg)) + return; + type_id = vkd3d_spirv_get_op_type_sampler(builder); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, @@ -3852,6 +3897,64 @@ static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler reg->type == VKD3DSPR_UAV ? 2 : 1, format); } +static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *resource, enum vkd3d_shader_resource_type resource_type, + enum vkd3d_component_type sampled_type, unsigned int structure_stride, bool raw, + const struct vkd3d_spirv_resource_type *resource_type_info) +{ + const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; + const SpvStorageClass storage_class = SpvStorageClassUniformConstant; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_combined_resource_sampler *current; + const unsigned int resource_index = resource->idx[0].offset; + uint32_t image_type_id, type_id, ptr_type_id, var_id; + bool is_buffer_resource, depth; + struct vkd3d_symbol symbol; + unsigned int i; + + is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + + for (i = 0; i < shader_interface->combined_sampler_count; ++i) + { + current = &shader_interface->combined_samplers[i]; + + if (current->resource_index != resource_index || current->is_buffer != is_buffer_resource) + continue; + + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) + continue; + + depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX + && scan_info->sampler_comparison_mode_mask & (1u << current->sampler_index); + + image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, + resource, resource_type_info, sampled_type, structure_stride || raw, depth); + type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id); + + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); + var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, + ptr_type_id, storage_class, 0); + + vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); + + if (current->sampler_index == VKD3D_DUMMY_SAMPLER_INDEX) + vkd3d_spirv_build_op_name(builder, var_id, "t%u_dummy_sampler", resource_index); + else + vkd3d_spirv_build_op_name(builder, var_id, "t%u_s%u", resource_index, current->sampler_index); + + vkd3d_symbol_make_combined_sampler(&symbol, resource_index, current->sampler_index); + symbol.id = var_id; + symbol.info.resource.sampled_type = sampled_type; + symbol.info.resource.type_id = image_type_id; + symbol.info.resource.resource_type_info = resource_type_info; + symbol.info.resource.structure_stride = structure_stride; + symbol.info.resource.raw = raw; + symbol.info.resource.uav_counter_id = 0; + vkd3d_dxbc_compiler_put_symbol(compiler, &symbol); + } +} + static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw) @@ -3875,6 +3978,13 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp sampled_type = vkd3d_component_type_from_data_type(resource_data_type); + if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, reg, NULL)) + { + vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, + reg, resource_type, sampled_type, structure_stride, raw, resource_type_info); + return; + } + type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, reg, resource_type_info, sampled_type, structure_stride || raw, 0); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -5350,27 +5460,65 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_resource(struct vkd3d return RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); } +static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg) +{ + const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + unsigned int resource_index, sampler_index; + struct vkd3d_symbol key; + struct rb_entry *entry; + + if (!shader_interface->combined_sampler_count) + return NULL; + + resource_index = resource_reg->idx[0].offset; + sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_DUMMY_SAMPLER_INDEX; + + vkd3d_symbol_make_combined_sampler(&key, resource_index, sampler_index); + if ((entry = rb_get(&compiler->symbol_table, &key))) + return RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + return NULL; +} + static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg, unsigned int flags) { + const struct vkd3d_symbol *symbol = NULL, *combined_sampler = NULL; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t sampler_var_id, sampler_id, sampled_image_type_id; - const struct vkd3d_symbol *resource_symbol; bool load, depth_comparison; load = !(flags & VKD3D_IMAGE_FLAG_NO_LOAD); depth_comparison = flags & VKD3D_IMAGE_FLAG_DEPTH; - resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); + if (flags & VKD3D_IMAGE_FLAG_SAMPLED) + { + assert(load); + combined_sampler = vkd3d_dxbc_compiler_find_combined_sampler(compiler, + resource_reg, sampler_reg); + symbol = combined_sampler; + } + if (!symbol) + symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); + + image->id = symbol->id; + image->sampled_type = symbol->info.resource.sampled_type; + image->image_type_id = symbol->info.resource.type_id; + image->resource_type_info = symbol->info.resource.resource_type_info; + image->structure_stride = symbol->info.resource.structure_stride; + image->raw = symbol->info.resource.raw; - image->sampled_type = resource_symbol->info.resource.sampled_type; - image->image_type_id = resource_symbol->info.resource.type_id; - image->resource_type_info = resource_symbol->info.resource.resource_type_info; - image->structure_stride = resource_symbol->info.resource.structure_stride; - image->raw = resource_symbol->info.resource.raw; + if (combined_sampler) + { + sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); + image->sampled_image_id = vkd3d_spirv_build_op_load(builder, + sampled_image_type_id, image->id, SpvMemoryAccessMaskNone); + image->image_id = vkd3d_spirv_build_op_image(builder, + image->image_type_id, image->sampled_image_id); + return; + } - image->id = resource_symbol->id; image->image_id = load ? vkd3d_spirv_build_op_load(builder, image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 82721f27b448..db761d884756 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1434,6 +1434,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; + shader_interface.combined_samplers = NULL; + shader_interface.combined_sampler_count = 0; shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2002,6 +2004,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; + shader_interface.combined_samplers = NULL; + shader_interface.combined_sampler_count = 0; shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; -- 2.18.1

2 1

[PATCH vkd3d 2/7] vkd3d-shader: Generalize helper for emitting descriptor binding decorations.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 33be8de7e78d..93a549c5d6cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2015,7 +2015,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; - struct vkd3d_shader_descriptor_binding vk_binding; + struct vkd3d_shader_descriptor_binding binding; unsigned int reg_idx = reg->idx[0].offset; bool is_buffer_resource; unsigned int i; @@ -2068,21 +2068,28 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor descriptor_type, reg_idx, compiler->shader_type); } - vk_binding.set = 0; - vk_binding.binding = compiler->binding_idx++; - return vk_binding; + binding.set = 0; + binding.binding = compiler->binding_idx++; + return binding; } static void vkd3d_dxbc_compiler_emit_descriptor_binding(struct vkd3d_dxbc_compiler *compiler, + uint32_t variable_id, const struct vkd3d_shader_descriptor_binding *binding) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationDescriptorSet, binding->set); + vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, binding->binding); +} + +static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxbc_compiler *compiler, uint32_t variable_id, const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - struct vkd3d_shader_descriptor_binding vk_binding; + struct vkd3d_shader_descriptor_binding binding; - vk_binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter); - vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationDescriptorSet, vk_binding.set); - vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, vk_binding.binding); + binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter); + vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } static void vkd3d_dxbc_compiler_put_symbol(struct vkd3d_dxbc_compiler *compiler, @@ -3688,7 +3695,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, pointer_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, VKD3D_SHADER_RESOURCE_BUFFER, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3751,7 +3758,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, VKD3D_SHADER_RESOURCE_NONE, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3874,7 +3881,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, reg, resource_type, false); + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, resource_type, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3896,7 +3903,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, counter_var_id, reg, resource_type, true); vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset); -- 2.18.1

2 1

[PATCH vkd3d 4/7] vkd3d-shader: Scan sampler comparison mode.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index f0ff82b8ce7f..ce8de6dad388 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -345,6 +345,7 @@ struct vkd3d_shader_scan_info { unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; + uint32_t sampler_comparison_mode_mask; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5b269bd6a343..348fa5d6e7c6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -160,11 +160,25 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info * scan_info->uav_counter_mask |= 1u << reg->idx[0].offset; } +static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_info *scan_info, + const struct vkd3d_shader_instruction *instruction) +{ + unsigned int sampler_index = instruction->declaration.dst.reg.idx[0].offset; + if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) + { + assert(sampler_index < CHAR_BIT * sizeof(scan_info->sampler_comparison_mode_mask)); + scan_info->sampler_comparison_mode_mask |= 1u << sampler_index; + } +} + static void vkd3d_shader_scan_handle_instruction(struct vkd3d_shader_scan_info *scan_info, const struct vkd3d_shader_instruction *instruction) { unsigned int i; + if (instruction->handler_idx == VKD3DSIH_DCL_SAMPLER) + vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + if (vkd3d_shader_instruction_is_uav_read(instruction)) { for (i = 0; i < instruction->dst_count; ++i) -- 2.18.1

2 1