- Wine-Commits - list.winehq.org

Alex Henrie : winecoreaudio: Remove unused heap.h include.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 9c4bcd0d51b5ce2dedf5e6cf4c6e0041c8798fa4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c4bcd0d51b5ce2dedf5e6cf4c6e00… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 6 23:04:24 2023 -0700 winecoreaudio: Remove unused heap.h include. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b8992618a5a..59bdb7b7488 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -26,7 +26,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "wine/unixlib.h"

1 0

Jacek Caban : d3d11: Explicitly convert enums in d3d_depthstencil_state_create.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 65552452792373319e58baee2ee22095d6b6392c URL: https://gitlab.winehq.org/wine/wine/-/commit/65552452792373319e58baee2ee220… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 18:57:42 2023 +0200 d3d11: Explicitly convert enums in d3d_depthstencil_state_create. --- dlls/d3d11/state.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b1731322683..4f3d9f2bc94 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -738,6 +738,16 @@ static const struct wined3d_parent_ops d3d_depthstencil_state_wined3d_parent_ops d3d_depthstencil_state_wined3d_object_destroyed, }; +static enum wined3d_cmp_func wined3d_cmp_func_from_d3d11(D3D11_COMPARISON_FUNC func) +{ + return (enum wined3d_cmp_func)func; +} + +static enum wined3d_stencil_op wined3d_stencil_op_from_d3d11(D3D11_STENCIL_OP stencil_op) +{ + return (enum wined3d_stencil_op)stencil_op; +} + HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, struct d3d_depthstencil_state **state) { @@ -822,18 +832,18 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP wined3d_desc.depth = desc->DepthEnable; wined3d_desc.depth_write = desc->DepthWriteMask; - wined3d_desc.depth_func = desc->DepthFunc; + wined3d_desc.depth_func = wined3d_cmp_func_from_d3d11(desc->DepthFunc); wined3d_desc.stencil = desc->StencilEnable; wined3d_desc.stencil_read_mask = desc->StencilReadMask; wined3d_desc.stencil_write_mask = desc->StencilWriteMask; - wined3d_desc.front.fail_op = desc->FrontFace.StencilFailOp; - wined3d_desc.front.depth_fail_op = desc->FrontFace.StencilDepthFailOp; - wined3d_desc.front.pass_op = desc->FrontFace.StencilPassOp; - wined3d_desc.front.func = desc->FrontFace.StencilFunc; - wined3d_desc.back.fail_op = desc->BackFace.StencilFailOp; - wined3d_desc.back.depth_fail_op = desc->BackFace.StencilDepthFailOp; - wined3d_desc.back.pass_op = desc->BackFace.StencilPassOp; - wined3d_desc.back.func = desc->BackFace.StencilFunc; + wined3d_desc.front.fail_op = wined3d_stencil_op_from_d3d11(desc->FrontFace.StencilFailOp); + wined3d_desc.front.depth_fail_op = wined3d_stencil_op_from_d3d11(desc->FrontFace.StencilDepthFailOp); + wined3d_desc.front.pass_op = wined3d_stencil_op_from_d3d11(desc->FrontFace.StencilPassOp); + wined3d_desc.front.func = wined3d_cmp_func_from_d3d11(desc->FrontFace.StencilFunc); + wined3d_desc.back.fail_op = wined3d_stencil_op_from_d3d11(desc->BackFace.StencilFailOp); + wined3d_desc.back.depth_fail_op = wined3d_stencil_op_from_d3d11(desc->BackFace.StencilDepthFailOp); + wined3d_desc.back.pass_op = wined3d_stencil_op_from_d3d11(desc->BackFace.StencilPassOp); + wined3d_desc.back.func = wined3d_cmp_func_from_d3d11(desc->BackFace.StencilFunc); /* We cannot fail after creating a wined3d_depth_stencil_state object. It * would lead to double free. */ @@ -1563,11 +1573,6 @@ static BOOL wined3d_texture_compare_from_d3d11(enum D3D11_FILTER f) return D3D11_DECODE_IS_COMPARISON_FILTER(f); } -static enum wined3d_cmp_func wined3d_cmp_func_from_d3d11(D3D11_COMPARISON_FUNC f) -{ - return (enum wined3d_cmp_func)f; -} - static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, const D3D11_SAMPLER_DESC *desc) {

1 0

Alex Henrie : windows.media.devices: Use CRT allocation functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 4d60874061489c572487cd534fc8633605087b2c URL: https://gitlab.winehq.org/wine/wine/-/commit/4d60874061489c572487cd534fc863… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 6 22:37:09 2023 -0700 windows.media.devices: Use CRT allocation functions. --- dlls/windows.media.devices/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c index a52f696f1ad..22562f9659b 100644 --- a/dlls/windows.media.devices/main.c +++ b/dlls/windows.media.devices/main.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winstring.h" #include "wine/debug.h" -#include "wine/heap.h" #include "objbase.h" #include "activation.h" @@ -193,7 +192,7 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, return hr; } - s = heap_alloc((sizeof(id_fmt_pre) - sizeof(WCHAR)) + + s = malloc((sizeof(id_fmt_pre) - sizeof(WCHAR)) + (sizeof(id_fmt_hash) - sizeof(WCHAR)) + (wcslen(devid) + GUID_STR_LEN + 1 /* nul */) * sizeof(WCHAR)); @@ -210,7 +209,7 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, if (FAILED(hr)) WARN("WindowsCreateString failed: %08lx\n", hr); - heap_free(s); + free(s); CoTaskMemFree(devid); IMMDevice_Release(dev);

1 0

Alex Henrie : msiexec: Use CRT allocation functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 0f44b3bdcb3d91701a9a8ef1ad07f3e88c08a666 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f44b3bdcb3d91701a9a8ef1ad07f3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 6 22:17:35 2023 -0700 msiexec: Use CRT allocation functions. --- programs/msiexec/msiexec.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 71ecc0e590a..4770dfe4a02 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -29,7 +29,6 @@ #include <stdio.h> #include "wine/debug.h" -#include "wine/heap.h" #include "initguid.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -73,8 +72,8 @@ static void ShowUsage(int ExitCode) No typo: The LPWSTR parameter must be a LPWSTR * for this mode */ len = LoadStringW(hmsi, 10, (LPWSTR) &msi_res, 0); - msi_res = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - msiexec_help = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) + sizeof(msiexec_version)); + msi_res = malloc((len + 1) * sizeof(WCHAR)); + msiexec_help = malloc((len + 1) * sizeof(WCHAR) + sizeof(msiexec_version)); if (msi_res && msiexec_help) { *msi_res = 0; LoadStringW(hmsi, 10, msi_res, len + 1); @@ -82,8 +81,8 @@ static void ShowUsage(int ExitCode) swprintf(msiexec_help, len + 1 + ARRAY_SIZE(msiexec_version), msi_res, msiexec_version); MsiMessageBoxW(0, msiexec_help, NULL, 0, GetUserDefaultLangID(), 0); } - HeapFree(GetProcessHeap(), 0, msi_res); - HeapFree(GetProcessHeap(), 0, msiexec_help); + free(msi_res); + free(msiexec_help); ExitProcess(ExitCode); } @@ -101,7 +100,7 @@ static VOID StringListAppend(struct string_list **list, LPCWSTR str) { struct string_list *entry; - entry = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct string_list, str[lstrlenW(str) + 1])); + entry = malloc(FIELD_OFFSET(struct string_list, str[wcslen(str) + 1])); if(!entry) { WINE_ERR("Out of memory!\n"); @@ -134,7 +133,7 @@ static LPWSTR build_properties(struct string_list *property_list) for(list = property_list; list; list = list->next) len += lstrlenW(list->str) + 3; - ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + ret = malloc(len * sizeof(WCHAR)); /* add a space before each string, and quote the value */ p = ret; @@ -178,7 +177,7 @@ static LPWSTR build_transforms(struct string_list *transform_list) for(list = transform_list; list; list = list->next) len += lstrlenW(list->str) + 1; - ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + ret = malloc(len * sizeof(WCHAR)); /* add all the transforms with a semicolon between each one */ p = ret; @@ -218,10 +217,10 @@ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) return FALSE; if( lstrlenW(str1) != (len-1) ) return FALSE; - strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + strW = malloc(sizeof(WCHAR) * len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); - HeapFree(GetProcessHeap(), 0, strW); + free(strW); return (ret == CSTR_EQUAL); } @@ -246,10 +245,10 @@ static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2) return FALSE; if( lstrlenW(str1) < (len-1) ) return FALSE; - strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + strW = malloc(sizeof(WCHAR) * len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); - HeapFree(GetProcessHeap(), 0, strW); + free(strW); return (ret == CSTR_EQUAL); } @@ -388,7 +387,7 @@ static DWORD client_pid; static DWORD CALLBACK custom_action_thread(void *arg) { GUID guid = *(GUID *)arg; - heap_free(arg); + free(arg); return __wine_msi_call_dll_function(client_pid, &guid); } @@ -429,7 +428,7 @@ static int custom_action_server(const WCHAR *arg) return 0; } - thread_guid = heap_alloc(sizeof(GUID)); + thread_guid = malloc(sizeof(GUID)); memcpy(thread_guid, &guid, sizeof(GUID)); thread = CreateThread(NULL, 0, custom_action_thread, thread_guid, 0, NULL); @@ -533,13 +532,13 @@ static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) *pargv = NULL; count = chomp( cmdline, NULL ); - if (!(p = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(cmdline) + count + 1) * sizeof(WCHAR) ))) + if (!(p = malloc( (wcslen(cmdline) + count + 1) * sizeof(WCHAR) ))) return; count = chomp( cmdline, p ); - if (!(argv = HeapAlloc( GetProcessHeap(), 0, (count + 1) * sizeof(WCHAR *) ))) + if (!(argv = malloc( (count + 1) * sizeof(WCHAR *) ))) { - HeapFree( GetProcessHeap(), 0, p ); + free( p ); return; } for (i = 0; i < count; i++) @@ -569,7 +568,7 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg if(r == ERROR_SUCCESS && type == REG_SZ) { int len = lstrlenW( *pargv[0] ); - if (!(buf = HeapAlloc( GetProcessHeap(), 0, sz + (len + 1) * sizeof(WCHAR) ))) + if (!(buf = malloc( (len + 1) * sizeof(WCHAR) ))) { RegCloseKey( hkey ); return FALSE; @@ -582,7 +581,7 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg process_args(buf, pargc, pargv); ret = TRUE; } - HeapFree(GetProcessHeap(), 0, buf); + free(buf); } RegCloseKey(hkey); return ret; @@ -594,7 +593,7 @@ static WCHAR *get_path_with_extension(const WCHAR *package_name) unsigned int p; WCHAR *path; - if (!(path = heap_alloc(lstrlenW(package_name) * sizeof(WCHAR) + sizeof(ext)))) + if (!(path = malloc(wcslen(package_name) * sizeof(WCHAR) + sizeof(ext)))) { WINE_ERR("No memory.\n"); return NULL; @@ -606,7 +605,7 @@ static WCHAR *get_path_with_extension(const WCHAR *package_name) --p; if (path[p] == '.') { - heap_free(path); + free(path); return NULL; } lstrcatW(path, ext); @@ -1071,7 +1070,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine && (path = get_path_with_extension(PackageName))) { ReturnCode = MsiInstallProductW(path, Properties); - heap_free(path); + free(path); } } } @@ -1085,7 +1084,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine && (path = get_path_with_extension(PackageName))) { ReturnCode = MsiReinstallProductW(path, RepairMode); - heap_free(path); + free(path); } } }

1 0

Zebediah Figura : vkd3d-shader/ir: Synthesize HS inputs with the register index and write mask of the signature element.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 852eefc01df90c4202212944ecc4af4bac7a5fae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/852eefc01df90c4202212944ecc4a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 24 16:55:16 2023 -0500 vkd3d-shader/ir: Synthesize HS inputs with the register index and write mask of the signature element. This pass was written as if to output normalized I/O, but it runs before the I/O normalization pass. Fixes: 98b5e2c6e01199d714d18fccfe54826a680aecbf --- libs/vkd3d-shader/ir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1d4c0cb1..16e5948f 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -449,7 +449,8 @@ static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_p shader_dst_param_io_init(param, e, VKD3DSPR_INPUT, 2); param->reg.idx[0].offset = input_control_point_count; - param->reg.idx[1].offset = i; + param->reg.idx[1].offset = e->register_index; + param->write_mask = e->mask; ++ins; }

1 0

Zebediah Figura : vkd3d-shader/spirv: Use register counts from the signature and shader desc.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 12240efa79aec9dd7f5aea08d9d6150129d96cc3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/12240efa79aec9dd7f5aea08d9d61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 19 21:29:30 2023 -0500 vkd3d-shader/spirv: Use register counts from the signature and shader desc. --- libs/vkd3d-shader/ir.c | 10 ++-------- libs/vkd3d-shader/spirv.c | 33 ++++++++++++-------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++++++ 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 9d8a1ac3..1d4c0cb1 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -827,12 +827,6 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map return true; } -static bool sysval_semantic_is_tess_factor(enum vkd3d_shader_sysval_semantic sysval_semantic) -{ - return sysval_semantic >= VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE - && sysval_semantic <= VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN; -} - static unsigned int shader_register_normalise_arrayed_addressing(struct vkd3d_shader_register *reg, unsigned int id_idx, unsigned int register_index) { @@ -933,7 +927,7 @@ static bool shader_dst_param_io_normalise(struct vkd3d_shader_dst_param *dst_par id_idx = 1; } - if ((e->register_count > 1 || sysval_semantic_is_tess_factor(e->sysval_semantic))) + if ((e->register_count > 1 || vsir_sysval_semantic_is_tess_factor(e->sysval_semantic))) { if (is_io_dcl) { @@ -1008,7 +1002,7 @@ static void shader_src_param_io_normalise(struct vkd3d_shader_src_param *src_par element_idx = shader_signature_find_element_for_reg(signature, reg_idx, write_mask); e = &signature->elements[element_idx]; - if ((e->register_count > 1 || sysval_semantic_is_tess_factor(e->sysval_semantic))) + if ((e->register_count > 1 || vsir_sysval_semantic_is_tess_factor(e->sysval_semantic))) id_idx = shader_register_normalise_arrayed_addressing(reg, id_idx, e->register_index); reg->idx[id_idx].offset = element_idx; reg->idx_count = id_idx + 1; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fc2b2441..61d75757 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4576,7 +4576,7 @@ static uint32_t spirv_compiler_emit_builtin_variable_v(struct spirv_compiler *co assert(size_count <= ARRAY_SIZE(sizes)); memcpy(sizes, array_sizes, size_count * sizeof(sizes[0])); array_sizes = sizes; - sizes[0] = max(sizes[0], builtin->spirv_array_size); + sizes[size_count - 1] = max(sizes[size_count - 1], builtin->spirv_array_size); id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, builtin->component_type, builtin->component_count, array_sizes, size_count); @@ -4614,24 +4614,6 @@ static unsigned int shader_signature_next_location(const struct shader_signature return max_row; } -static unsigned int shader_register_get_io_indices(const struct vkd3d_shader_register *reg, - unsigned int *array_sizes) -{ - unsigned int i, element_idx; - - array_sizes[0] = 0; - array_sizes[1] = 0; - element_idx = reg->idx[0].offset; - for (i = 1; i < reg->idx_count; ++i) - { - array_sizes[1] = array_sizes[0]; - array_sizes[0] = element_idx; - element_idx = reg->idx[i].offset; - } - - return element_idx; -} - static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, const struct vkd3d_shader_dst_param *dst) { @@ -4660,7 +4642,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, shader_signature = reg->type == VKD3DSPR_PATCHCONST ? &compiler->patch_constant_signature : &compiler->input_signature; - element_idx = shader_register_get_io_indices(reg, array_sizes); + element_idx = reg->idx[reg->idx_count - 1].offset; signature_element = &shader_signature->elements[element_idx]; sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); /* The Vulkan spec does not explicitly forbid passing varyings from the @@ -4671,6 +4653,11 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, builtin = get_spirv_builtin_for_sysval(compiler, sysval); + array_sizes[0] = (reg->type == VKD3DSPR_PATCHCONST ? 0 : compiler->input_control_point_count); + array_sizes[1] = signature_element->register_count; + if (array_sizes[1] == 1 && !vsir_sysval_semantic_is_tess_factor(signature_element->sysval_semantic)) + array_sizes[1] = 0; + write_mask = signature_element->mask; if (builtin) @@ -5021,12 +5008,16 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, const st shader_signature = is_patch_constant ? &compiler->patch_constant_signature : &compiler->output_signature; - element_idx = shader_register_get_io_indices(reg, array_sizes); + element_idx = reg->idx[reg->idx_count - 1].offset; signature_element = &shader_signature->elements[element_idx]; sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); /* Don't use builtins for TCS -> TES varyings. See spirv_compiler_emit_input(). */ if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && !is_patch_constant) sysval = VKD3D_SIV_NONE; + array_sizes[0] = (reg->type == VKD3DSPR_PATCHCONST ? 0 : compiler->output_control_point_count); + array_sizes[1] = signature_element->register_count; + if (array_sizes[1] == 1 && !vsir_sysval_semantic_is_tess_factor(signature_element->sysval_semantic)) + array_sizes[1] = 0; builtin = vkd3d_get_spirv_builtin(compiler, dst->reg.type, sysval); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d161e00c..0871f8b1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -942,6 +942,12 @@ struct shader_signature unsigned int element_count; }; +static inline bool vsir_sysval_semantic_is_tess_factor(enum vkd3d_shader_sysval_semantic sysval_semantic) +{ + return sysval_semantic >= VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE + && sysval_semantic <= VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN; +} + struct signature_element *vsir_signature_find_element_for_reg(const struct shader_signature *signature, unsigned int reg_idx, unsigned int write_mask); void shader_signature_cleanup(struct shader_signature *signature);

1 0

Zebediah Figura : vkd3d-shader/spirv: Use the array sizes for shader phase builtins as well.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 3ff22ac5af99ce809aefd1ae5c48d2a6092769e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3ff22ac5af99ce809aefd1ae5c48d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 16 21:57:55 2023 -0500 vkd3d-shader/spirv: Use the array sizes for shader phase builtins as well. --- libs/vkd3d-shader/spirv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a25edb64..f9d28b1a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4974,7 +4974,7 @@ static void spirv_compiler_emit_output_register(struct spirv_compiler *compiler, } static uint32_t spirv_compiler_emit_shader_phase_builtin_variable(struct spirv_compiler *compiler, - const struct vkd3d_spirv_builtin *builtin) + const struct vkd3d_spirv_builtin *builtin, const unsigned int *array_sizes, unsigned int size_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t *variable_id, id; @@ -4989,7 +4989,7 @@ static uint32_t spirv_compiler_emit_shader_phase_builtin_variable(struct spirv_c if (variable_id && *variable_id) return *variable_id; - id = spirv_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassOutput, 0); + id = spirv_compiler_emit_builtin_variable_v(compiler, builtin, SpvStorageClassOutput, array_sizes, size_count); if (is_in_fork_or_join_phase(compiler)) vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); @@ -5071,7 +5071,7 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, const st else if (builtin) { if (spirv_compiler_get_current_shader_phase(compiler)) - id = spirv_compiler_emit_shader_phase_builtin_variable(compiler, builtin); + id = spirv_compiler_emit_shader_phase_builtin_variable(compiler, builtin, array_sizes, 2); else id = spirv_compiler_emit_builtin_variable_v(compiler, builtin, storage_class, array_sizes, 2);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Check that SWITCH blocks are correctly nested.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 7d49f9637aeba4478fd7130eebdd58b55c876d36 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d49f9637aeba4478fd7130eebdd5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 13:57:25 2023 +0100 vkd3d-shader/ir: Check that SWITCH blocks are correctly nested. --- libs/vkd3d-shader/ir.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index bc48df8c..9d8a1ac3 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1701,6 +1701,23 @@ static void vsir_validate_instruction(struct validation_context *ctx) --ctx->depth; break; + case VKD3DSIH_SWITCH: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 1); + if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) + return; + ctx->blocks[ctx->depth++] = instruction->handler_idx; + break; + + case VKD3DSIH_ENDSWITCH: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (ctx->depth == 0 || ctx->blocks[ctx->depth - 1] != VKD3DSIH_SWITCH) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "ENDSWITCH instruction doesn't terminate SWITCH block."); + else + --ctx->depth; + break; + default: break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Check that a partial register's mask is also available in is_range_available().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: c683fc9402ac1057e50f8efd0489ee43b042e0c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c683fc9402ac1057e50f8efd0489e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 27 10:27:37 2023 -0500 vkd3d-shader/hlsl: Check that a partial register's mask is also available in is_range_available(). --- libs/vkd3d-shader/hlsl_codegen.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6eac5d49..456c393e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3556,13 +3556,19 @@ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct register_a static bool is_range_available(const struct register_allocator *allocator, unsigned int first_write, unsigned int last_read, uint32_t reg_idx, unsigned int reg_size) { + unsigned int last_reg_mask = (1u << (reg_size % 4)) - 1; + unsigned int writemask; uint32_t i; for (i = 0; i < (reg_size / 4); ++i) { - if (get_available_writemask(allocator, first_write, last_read, reg_idx + i) != VKD3DSP_WRITEMASK_ALL) + writemask = get_available_writemask(allocator, first_write, last_read, reg_idx + i); + if (writemask != VKD3DSP_WRITEMASK_ALL) return false; } + writemask = get_available_writemask(allocator, first_write, last_read, reg_idx + (reg_size / 4)); + if ((writemask & last_reg_mask) != last_reg_mask) + return false; return true; }

1 0

Zebediah Figura : vkd3d-shader: Store the control point counts in struct vkd3d_shader_desc.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 0058764f014c5772d93d69238bd928b89aab563f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0058764f014c5772d93d69238bd92… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 23 22:14:09 2023 -0500 vkd3d-shader: Store the control point counts in struct vkd3d_shader_desc. --- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/tpf.c | 29 +++++++++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f9d28b1a..fc2b2441 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9338,11 +9338,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_DCL_GS_INSTANCES: spirv_compiler_emit_dcl_gs_instances(compiler, instruction); break; - case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: - compiler->input_control_point_count = instruction->declaration.count; - break; case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: - compiler->output_control_point_count = instruction->declaration.count; spirv_compiler_emit_output_vertex_count(compiler, instruction); break; case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: @@ -9602,6 +9598,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_DCL: case VKD3DSIH_DCL_CONSTANT_BUFFER: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: + case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_SAMPLER: @@ -9700,6 +9697,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); compiler->use_vocp = parser->shader_desc.use_vocp; + compiler->input_control_point_count = shader_desc->input_control_point_count; + compiler->output_control_point_count = shader_desc->output_control_point_count; + if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) spirv_compiler_emit_shader_signature_outputs(compiler); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 62b10390..a9d89bd7 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -659,16 +659,18 @@ static const enum vkd3d_primitive_type output_primitive_type_table[] = /* VKD3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ VKD3D_PT_TRIANGLESTRIP, }; -static const enum vkd3d_primitive_type input_primitive_type_table[] = +static const struct { - /* UNKNOWN */ VKD3D_PT_UNDEFINED, - /* VKD3D_SM4_INPUT_PT_POINT */ VKD3D_PT_POINTLIST, - /* VKD3D_SM4_INPUT_PT_LINE */ VKD3D_PT_LINELIST, - /* VKD3D_SM4_INPUT_PT_TRIANGLE */ VKD3D_PT_TRIANGLELIST, - /* UNKNOWN */ VKD3D_PT_UNDEFINED, - /* UNKNOWN */ VKD3D_PT_UNDEFINED, - /* VKD3D_SM4_INPUT_PT_LINEADJ */ VKD3D_PT_LINELIST_ADJ, - /* VKD3D_SM4_INPUT_PT_TRIANGLEADJ */ VKD3D_PT_TRIANGLELIST_ADJ, + unsigned int control_point_count; + enum vkd3d_primitive_type vkd3d_type; +} +input_primitive_type_table[] = +{ + [VKD3D_SM4_INPUT_PT_POINT] = {1, VKD3D_PT_POINTLIST}, + [VKD3D_SM4_INPUT_PT_LINE] = {2, VKD3D_PT_LINELIST}, + [VKD3D_SM4_INPUT_PT_TRIANGLE] = {3, VKD3D_PT_TRIANGLELIST}, + [VKD3D_SM4_INPUT_PT_LINEADJ] = {4, VKD3D_PT_LINELIST_ADJ}, + [VKD3D_SM4_INPUT_PT_TRIANGLEADJ] = {6, VKD3D_PT_TRIANGLELIST_ADJ}, }; static const enum vkd3d_shader_resource_type resource_type_table[] = @@ -1037,6 +1039,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction { ins->declaration.primitive_type.type = VKD3D_PT_PATCH; ins->declaration.primitive_type.patch_vertex_count = primitive_type - VKD3D_SM5_INPUT_PT_PATCH1 + 1; + priv->p.shader_desc.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count; } else if (primitive_type >= ARRAY_SIZE(input_primitive_type_table)) { @@ -1044,7 +1047,8 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction } else { - ins->declaration.primitive_type.type = input_primitive_type_table[primitive_type]; + ins->declaration.primitive_type.type = input_primitive_type_table[primitive_type].vkd3d_type; + priv->p.shader_desc.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count; } if (ins->declaration.primitive_type.type == VKD3D_PT_UNDEFINED) @@ -1154,6 +1158,11 @@ static void shader_sm5_read_control_point_count(struct vkd3d_shader_instruction { ins->declaration.count = (opcode_token & VKD3D_SM5_CONTROL_POINT_COUNT_MASK) >> VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT; + + if (opcode == VKD3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT) + priv->p.shader_desc.input_control_point_count = ins->declaration.count; + else + priv->p.shader_desc.output_control_point_count = ins->declaration.count; } static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, uint32_t opcode, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 55808785..d161e00c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -955,6 +955,8 @@ struct vkd3d_shader_desc struct shader_signature output_signature; struct shader_signature patch_constant_signature; + unsigned int input_control_point_count, output_control_point_count; + uint32_t temp_count; unsigned int ssa_count;

1 0