October 2022 - Wine-commits

Connor McAdams : uiautomationcore: Track all HUIANODEs returned from the provider thread.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 858e9a4cebe75d10d984a16fce562fd4f79e524f URL: https://gitlab.winehq.org/wine/wine/-/commit/858e9a4cebe75d10d984a16fce562f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 15 12:35:40 2022 -0400 uiautomationcore: Track all HUIANODEs returned from the provider thread. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 4 ++++ dlls/uiautomationcore/uia_private.h | 3 +++ dlls/uiautomationcore/uia_provider.c | 40 +++++++++++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 08fe3b863ae..a648d99f103 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -313,6 +313,8 @@ static ULONG WINAPI uia_node_Release(IWineUiaNode *iface) } IWineUiaProvider_Release(node->prov); + if (!list_empty(&node->prov_thread_list_entry)) + uia_provider_thread_remove_node((HUIANODE)iface); if (node->nested_node) uia_stop_provider_thread(); @@ -751,6 +753,7 @@ HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE * } node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; + list_init(&node->prov_thread_list_entry); node->ref = 1; *huianode = (void *)&node->IWineUiaNode_iface; @@ -1127,6 +1130,7 @@ HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) node->hwnd = hwnd; node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; + list_init(&node->prov_thread_list_entry); node->ref = 1; hr = uia_get_provider_from_hwnd(node); diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 1efc8fbd1e4..da7f54c8ce3 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -20,6 +20,7 @@ #include "uiautomation.h" #include "uia_classes.h" +#include "wine/list.h" extern HMODULE huia_module DECLSPEC_HIDDEN; @@ -38,6 +39,7 @@ struct uia_node { HWND hwnd; BOOL nested_node; + struct list prov_thread_list_entry; }; static inline struct uia_node *impl_from_IWineUiaNode(IWineUiaNode *iface) @@ -50,3 +52,4 @@ const struct uia_prop_info *uia_prop_info_from_id(PROPERTYID prop_id) DECLSPEC_H /* uia_provider.c */ void uia_stop_provider_thread(void) DECLSPEC_HIDDEN; +void uia_provider_thread_remove_node(HUIANODE node) DECLSPEC_HIDDEN; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 7b4a6be4042..fe7dff9112e 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1130,6 +1130,7 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD */ struct uia_provider_thread { + struct list nodes_list; HANDLE hthread; HWND hwnd; LONG ref; @@ -1145,6 +1146,33 @@ static CRITICAL_SECTION_DEBUG provider_thread_cs_debug = }; static CRITICAL_SECTION provider_thread_cs = { &provider_thread_cs_debug, -1, 0, 0, 0, 0 }; +void uia_provider_thread_remove_node(HUIANODE node) +{ + struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); + + TRACE("Removing node %p\n", node); + + EnterCriticalSection(&provider_thread_cs); + list_remove(&node_data->prov_thread_list_entry); + list_init(&node_data->prov_thread_list_entry); + LeaveCriticalSection(&provider_thread_cs); +} + +static HRESULT uia_provider_thread_add_node(HUIANODE node) +{ + struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); + + TRACE("Adding node %p\n", node); + + node_data->nested_node = TRUE; + + EnterCriticalSection(&provider_thread_cs); + list_add_tail(&provider_thread.nodes_list, &node_data->prov_thread_list_entry); + LeaveCriticalSection(&provider_thread_cs); + + return S_OK; +} + #define WM_GET_OBJECT_UIA_NODE (WM_USER + 1) #define WM_UIA_PROVIDER_THREAD_STOP (WM_USER + 2) static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM wparam, @@ -1155,11 +1183,14 @@ static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM case WM_GET_OBJECT_UIA_NODE: { HUIANODE node = (HUIANODE)lparam; - struct uia_node *node_data; LRESULT lr; - node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); - node_data->nested_node = TRUE; + if (FAILED(uia_provider_thread_add_node(node))) + { + WARN("Failed to add node %p to provider thread list.\n", node); + UiaNodeRelease(node); + return 0; + } /* * LresultFromObject returns an index into the global atom string table, @@ -1239,6 +1270,7 @@ static BOOL uia_start_provider_thread(void) GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)uia_start_provider_thread, &hmodule); + list_init(&provider_thread.nodes_list); events[0] = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!(provider_thread.hthread = CreateThread(NULL, 0, uia_provider_thread_proc, ready_event, 0, NULL))) @@ -1276,6 +1308,8 @@ void uia_stop_provider_thread(void) { PostMessageW(provider_thread.hwnd, WM_UIA_PROVIDER_THREAD_STOP, 0, 0); CloseHandle(provider_thread.hthread); + if (!list_empty(&provider_thread.nodes_list)) + ERR("Provider thread shutdown with nodes still in the list\n"); memset(&provider_thread, 0, sizeof(provider_thread)); } LeaveCriticalSection(&provider_thread_cs);

1 0

Connor McAdams : uiautomationcore: Implement UiaDisconnectProvider.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 890faf87dd691df95e55976b02aa7999d3340c41 URL: https://gitlab.winehq.org/wine/wine/-/commit/890faf87dd691df95e55976b02aa79… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 10 14:11:01 2022 -0400 uiautomationcore: Implement UiaDisconnectProvider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 288 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 99 +++++++++- dlls/uiautomationcore/uia_main.c | 6 - dlls/uiautomationcore/uia_private.h | 6 + dlls/uiautomationcore/uia_provider.c | 74 +++++++- include/uiautomationcoreapi.h | 1 + 7 files changed, 465 insertions(+), 10 deletions(-)

1 0

Connor McAdams : uiautomationcore: Store provider thread nodes that have a runtime ID in an rbtree.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 5d3e444b1cbdbbeeef2b6b7b6508b0ca3dbbd9c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d3e444b1cbdbbeeef2b6b7b6508b0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 10 14:27:35 2022 -0400 uiautomationcore: Store provider thread nodes that have a runtime ID in an rbtree. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 2 + dlls/uiautomationcore/uia_private.h | 4 +- dlls/uiautomationcore/uia_provider.c | 99 ++++++++++++++++++++++++++++++------ 3 files changed, 87 insertions(+), 18 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 2d97ff13159..24de251eb8a 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -851,6 +851,7 @@ HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE * node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; list_init(&node->prov_thread_list_entry); + list_init(&node->node_map_list_entry); node->ref = 1; *huianode = (void *)&node->IWineUiaNode_iface; @@ -1228,6 +1229,7 @@ HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) node->hwnd = hwnd; node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; list_init(&node->prov_thread_list_entry); + list_init(&node->node_map_list_entry); node->ref = 1; hr = uia_get_provider_from_hwnd(node); diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index c4512ecd046..c94f2b6c1eb 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -40,9 +40,9 @@ struct uia_node { HWND hwnd; BOOL nested_node; BOOL disconnected; - /* This RuntimeId is used as a comparison for UiaDisconnectProvider(). */ - SAFEARRAY *runtime_id; struct list prov_thread_list_entry; + struct list node_map_list_entry; + struct uia_provider_thread_map_entry *map; }; static inline struct uia_node *impl_from_IWineUiaNode(IWineUiaNode *iface) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 76eea75f855..17adf622ffe 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/rbtree.h" #include "initguid.h" #include "wine/iaccessible2.h" @@ -1130,6 +1131,7 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD */ struct uia_provider_thread { + struct rb_tree node_map; struct list nodes_list; HANDLE hthread; HWND hwnd; @@ -1146,6 +1148,20 @@ static CRITICAL_SECTION_DEBUG provider_thread_cs_debug = }; static CRITICAL_SECTION provider_thread_cs = { &provider_thread_cs_debug, -1, 0, 0, 0, 0 }; +struct uia_provider_thread_map_entry +{ + struct rb_entry entry; + + SAFEARRAY *runtime_id; + struct list nodes_list; +}; + +static int uia_runtime_id_compare(const void *key, const struct rb_entry *entry) +{ + struct uia_provider_thread_map_entry *prov_entry = RB_ENTRY_VALUE(entry, struct uia_provider_thread_map_entry, entry); + return uia_compare_runtime_ids(prov_entry->runtime_id, (SAFEARRAY *)key); +} + void uia_provider_thread_remove_node(HUIANODE node) { struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); @@ -1153,17 +1169,28 @@ void uia_provider_thread_remove_node(HUIANODE node) TRACE("Removing node %p\n", node); EnterCriticalSection(&provider_thread_cs); + list_remove(&node_data->prov_thread_list_entry); list_init(&node_data->prov_thread_list_entry); - SafeArrayDestroy(node_data->runtime_id); - node_data->runtime_id = NULL; + if (!list_empty(&node_data->node_map_list_entry)) + { + list_remove(&node_data->node_map_list_entry); + list_init(&node_data->node_map_list_entry); + if (list_empty(&node_data->map->nodes_list)) + { + rb_remove(&provider_thread.node_map, &node_data->map->entry); + SafeArrayDestroy(node_data->map->runtime_id); + heap_free(node_data->map); + } + node_data->map = NULL; + } + LeaveCriticalSection(&provider_thread_cs); } static void uia_provider_thread_disconnect_node(SAFEARRAY *sa) { - struct list *cursor, *cursor2; - struct uia_node *node_data; + struct rb_entry *rb_entry; EnterCriticalSection(&provider_thread_cs); @@ -1171,21 +1198,30 @@ static void uia_provider_thread_disconnect_node(SAFEARRAY *sa) if (!provider_thread.ref) goto exit; - LIST_FOR_EACH_SAFE(cursor, cursor2, &provider_thread.nodes_list) + rb_entry = rb_get(&provider_thread.node_map, sa); + if (rb_entry) { - node_data = LIST_ENTRY(cursor, struct uia_node, prov_thread_list_entry); + struct uia_provider_thread_map_entry *prov_map; + struct list *cursor, *cursor2; + struct uia_node *node_data; - if (node_data->runtime_id) + prov_map = RB_ENTRY_VALUE(rb_entry, struct uia_provider_thread_map_entry, entry); + LIST_FOR_EACH_SAFE(cursor, cursor2, &prov_map->nodes_list) { - if (!uia_compare_runtime_ids(sa, node_data->runtime_id)) - { - list_remove(cursor); - list_init(&node_data->prov_thread_list_entry); - IWineUiaNode_disconnect(&node_data->IWineUiaNode_iface); - SafeArrayDestroy(node_data->runtime_id); - node_data->runtime_id = NULL; - } + node_data = LIST_ENTRY(cursor, struct uia_node, node_map_list_entry); + + list_remove(cursor); + list_remove(&node_data->prov_thread_list_entry); + list_init(&node_data->prov_thread_list_entry); + list_init(&node_data->node_map_list_entry); + node_data->map = NULL; + + IWineUiaNode_disconnect(&node_data->IWineUiaNode_iface); } + + rb_remove(&provider_thread.node_map, &prov_map->entry); + SafeArrayDestroy(prov_map->runtime_id); + heap_free(prov_map); } exit: @@ -1206,8 +1242,38 @@ static HRESULT uia_provider_thread_add_node(HUIANODE node) TRACE("Adding node %p\n", node); EnterCriticalSection(&provider_thread_cs); - node_data->runtime_id = sa; list_add_tail(&provider_thread.nodes_list, &node_data->prov_thread_list_entry); + + /* If we have a runtime ID, create an entry in the rb tree. */ + if (sa) + { + struct uia_provider_thread_map_entry *prov_map; + struct rb_entry *rb_entry; + + if ((rb_entry = rb_get(&provider_thread.node_map, sa))) + { + prov_map = RB_ENTRY_VALUE(rb_entry, struct uia_provider_thread_map_entry, entry); + SafeArrayDestroy(sa); + } + else + { + prov_map = heap_alloc_zero(sizeof(*prov_map)); + if (!prov_map) + { + SafeArrayDestroy(sa); + LeaveCriticalSection(&provider_thread_cs); + return E_OUTOFMEMORY; + } + + prov_map->runtime_id = sa; + list_init(&prov_map->nodes_list); + rb_put(&provider_thread.node_map, sa, &prov_map->entry); + } + + list_add_tail(&prov_map->nodes_list, &node_data->node_map_list_entry); + node_data->map = prov_map; + } + LeaveCriticalSection(&provider_thread_cs); return S_OK; @@ -1311,6 +1377,7 @@ static BOOL uia_start_provider_thread(void) (const WCHAR *)uia_start_provider_thread, &hmodule); list_init(&provider_thread.nodes_list); + rb_init(&provider_thread.node_map, uia_runtime_id_compare); events[0] = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!(provider_thread.hthread = CreateThread(NULL, 0, uia_provider_thread_proc, ready_event, 0, NULL)))

1 0

Connor McAdams : uiautomationcore: Add UIAutomationType_Element property support for nested node providers.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: a6f428fae6313107c34fb7e43c26d1e602bd0a3d URL: https://gitlab.winehq.org/wine/wine/-/commit/a6f428fae6313107c34fb7e43c26d1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 5 17:04:14 2022 -0400 uiautomationcore: Add UIAutomationType_Element property support for nested node providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 214 ++++++++++++++--------------- dlls/uiautomationcore/uia_client.c | 93 ++++++++++--- dlls/uiautomationcore/uia_private.h | 14 ++ dlls/uiautomationcore/uia_provider.c | 5 +- 4 files changed, 194 insertions(+), 132 deletions(-)

1 0

Zebediah Figura : tests: Add a test for asuint().
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: eb70f1aeb5816e746cb1336cadfbd37ddd9a0ec9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb70f1aeb5816e746cb1336cadfbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 27 13:35:16 2022 -0500 tests: Add a test for asuint(). --- tests/asuint.shader_test | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 12 +++++++---- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/tests/asuint.shader_test b/tests/asuint.shader_test new file mode 100644 index 00000000..77385515 --- /dev/null +++ b/tests/asuint.shader_test @@ -0,0 +1,55 @@ +[require] +shader model >= 4.0 + +[pixel shader] + +float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv_target +{ + uint4 ret; + + ret.x = asuint(f); + ret.y = asuint(i); + ret.z = asuint(u); + ret.w = asuint(h); + return ret; +} + +[test] +uniform 0 uint4 123 0xc0000000 456 0x7fd69345 +todo draw quad +probe (320,240) rgba (123.0, 3221225472.0, 456.0, 2144768896.0) + + +[pixel shader] + +float4 main(uniform float2x2 m, uniform float4 v) : sv_target +{ + return float4(asuint(m)[0][1], asuint(v).y, 0, 0); +} + +[test] +uniform 0 uint4 11 12 0 0 +uniform 4 uint4 13 14 0 0 +uniform 8 uint4 20 21 22 23 +todo draw quad +probe (320,240) rgba (13.0, 21.0, 0.0, 0.0) + + +[pixel shader fail] + +float4 main() : sv_target +{ + bool b = true; + + return asuint(b); +} + + +[pixel shader fail] + +float4 main() : sv_target +{ + double d = 1.0; + + return asuint(b); +} diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 25986b31..3fb677ce 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -557,7 +557,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) unsigned int offset; if (!sscanf(line, "%u", &offset)) - fatal_error("Unknown uniform type '%s'.\n", line); + fatal_error("Malformed uniform offset '%s'.\n", line); line = strchr(line, ' ') + 1; if (match_string(line, "float4", &line)) @@ -576,12 +576,12 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Malformed float constant '%s'.\n", line); set_uniforms(runner, offset, 1, &f); } - else if (match_string(line, "int4", &line)) + else if (match_string(line, "int4", &line) || match_string(line, "uint4", &line)) { int v[4]; - if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) - fatal_error("Malformed int4 constant '%s'.\n", line); + if (sscanf(line, "%i %i %i %i", &v[0], &v[1], &v[2], &v[3]) < 4) + fatal_error("Malformed (u)int4 constant '%s'.\n", line); set_uniforms(runner, offset, 4, v); } else if (match_string(line, "int", &line)) @@ -600,6 +600,10 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Malformed uint constant '%s'.\n", line); set_uniforms(runner, offset, 1, &u); } + else + { + fatal_error("Unknown uniform type '%s'.\n", line); + } } else {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the asuint() intrinsic.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 2d4d2e12447b39ca0a1a5a8155035f9332d824ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2d4d2e12447b39ca0a1a5a8155035… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 9 22:59:12 2022 -0500 vkd3d-shader/hlsl: Parse the asuint() intrinsic. --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c1cd065a..8eac4fe4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1642,6 +1642,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_NEG] = "-", [HLSL_OP1_NRM] = "nrm", [HLSL_OP1_RCP] = "rcp", + [HLSL_OP1_REINTERPRET] = "reinterpret", [HLSL_OP1_ROUND] = "round", [HLSL_OP1_RSQ] = "rsq", [HLSL_OP1_SAT] = "sat", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 770a4032..9039e9bc 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -312,6 +312,7 @@ enum hlsl_ir_expr_op HLSL_OP1_NEG, HLSL_OP1_NRM, HLSL_OP1_RCP, + HLSL_OP1_REINTERPRET, HLSL_OP1_ROUND, HLSL_OP1_RSQ, HLSL_OP1_SAT, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1bdc1433..bb98879e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2053,6 +2053,50 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ABS, params->args[0], loc); } +/* Find the type corresponding to the given source type, with the same + * dimensions but a different base type. */ +static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx, + const struct hlsl_type *type, enum hlsl_base_type base_type) +{ + return hlsl_get_numeric_type(ctx, type->type, base_type, type->dimx, type->dimy); +} + +static bool intrinsic_asuint(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *data_type; + + if (params->args_count != 1 && params->args_count != 3) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to function 'asuint': expected 1 or 3, but got %u.", params->args_count); + return false; + } + + if (params->args_count == 3) + { + hlsl_fixme(ctx, loc, "Double-to-integer conversion."); + return false; + } + + data_type = params->args[0]->data_type; + if (data_type->base_type == HLSL_TYPE_BOOL || data_type->base_type == HLSL_TYPE_DOUBLE) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument 0 of asuint(): expected 'int', 'uint', 'float', or 'half', but got '%s'.", + string->buffer); + hlsl_release_string_buffer(ctx, string); + } + data_type = convert_numeric_type(ctx, data_type, HLSL_TYPE_UINT); + + operands[0] = params->args[0]; + return add_expr(ctx, params->instrs, HLSL_OP1_REINTERPRET, operands, data_type, loc); +} + static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2361,6 +2405,7 @@ intrinsic_functions[] = { /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, + {"asuint", -1, true, intrinsic_asuint}, {"clamp", 3, true, intrinsic_clamp}, {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot},

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 reinterpret instructions.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 1e10b5e6162260a247f95b980213fc97be422e47 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1e10b5e6162260a247f95b980213f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 28 15:19:27 2022 -0500 vkd3d-shader/hlsl: Write SM4 reinterpret instructions. --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/asuint.shader_test | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 3ce6fc5e..b6d5e92c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1664,6 +1664,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP1_REINTERPRET: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, 0); + break; + case HLSL_OP1_ROUND: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NE, &expr->node, arg1, 0); diff --git a/tests/asuint.shader_test b/tests/asuint.shader_test index 77385515..a08beaf3 100644 --- a/tests/asuint.shader_test +++ b/tests/asuint.shader_test @@ -16,7 +16,7 @@ float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv [test] uniform 0 uint4 123 0xc0000000 456 0x7fd69345 -todo draw quad +draw quad probe (320,240) rgba (123.0, 3221225472.0, 456.0, 2144768896.0) @@ -31,7 +31,7 @@ float4 main(uniform float2x2 m, uniform float4 v) : sv_target uniform 0 uint4 11 12 0 0 uniform 4 uint4 13 14 0 0 uniform 8 uint4 20 21 22 23 -todo draw quad +draw quad probe (320,240) rgba (13.0, 21.0, 0.0, 0.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a hlsl_new_expr() helper.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 20fc4375ad281ddbdf70b9830f14faa0d2114a29 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/20fc4375ad281ddbdf70b9830f14f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 19:00:09 2022 -0500 vkd3d-shader/hlsl: Introduce a hlsl_new_expr() helper. --- libs/vkd3d-shader/hlsl.c | 40 +++++++++++++++++++++++++++------------- libs/vkd3d-shader/hlsl.h | 13 +++---------- libs/vkd3d-shader/hlsl.y | 12 ++++-------- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8eac4fe4..f0426620 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -835,6 +835,16 @@ void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_va deref->var = var; } +static void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, + struct hlsl_type *data_type, struct vkd3d_shader_location loc) +{ + memset(node, 0, sizeof(*node)); + node->type = type; + node->data_type = data_type; + node->loc = loc; + list_init(&node->uses); +} + struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) { struct hlsl_deref lhs_deref; @@ -962,33 +972,37 @@ struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned i return c; } -struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, - struct hlsl_ir_node *arg, struct vkd3d_shader_location loc) +struct hlsl_ir_node *hlsl_new_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], + struct hlsl_type *data_type, const struct vkd3d_shader_location *loc) { struct hlsl_ir_expr *expr; + unsigned int i; if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); + init_node(&expr->node, HLSL_IR_EXPR, data_type, *loc); expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg); + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) + hlsl_src_from_node(&expr->operands[i], operands[i]); return &expr->node; } +struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *arg, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {arg}; + + return hlsl_new_expr(ctx, op, operands, arg->data_type, &loc); +} + struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) { - struct hlsl_ir_expr *expr; + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {arg1, arg2}; assert(hlsl_types_are_equal(arg1->data_type, arg2->data_type)); - - if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) - return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); - expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg1); - hlsl_src_from_node(&expr->operands[1], arg2); - return &expr->node; + return hlsl_new_expr(ctx, op, operands, arg1->data_type, &arg1->loc); } struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9039e9bc..e8f01f2b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -589,16 +589,6 @@ static inline struct hlsl_ir_swizzle *hlsl_ir_swizzle(const struct hlsl_ir_node return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); } -static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, - struct hlsl_type *data_type, struct vkd3d_shader_location loc) -{ - memset(node, 0, sizeof(*node)); - node->type = type; - node->data_type = data_type; - node->loc = loc; - list_init(&node->uses); -} - static inline void hlsl_src_from_node(struct hlsl_src *src, struct hlsl_ir_node *node) { src->node = node; @@ -760,6 +750,9 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *no struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_type *type, const struct vkd3d_shader_location *loc); struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node); +struct hlsl_ir_node *hlsl_new_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], + struct hlsl_type *data_type, const struct vkd3d_shader_location *loc); struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f, const struct vkd3d_shader_location *loc); struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bb98879e..60ca09ce 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1217,7 +1217,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct hlsl_type *type, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_expr *expr; + struct hlsl_ir_node *expr; unsigned int i; if (type->type == HLSL_CLASS_MATRIX) @@ -1271,15 +1271,11 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return &load->node; } - if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) + if (!(expr = hlsl_new_expr(ctx, op, operands, type, loc))) return NULL; - init_node(&expr->node, HLSL_IR_EXPR, type, *loc); - expr->op = op; - for (i = 0; i < HLSL_MAX_OPERANDS; ++i) - hlsl_src_from_node(&expr->operands[i], operands[i]); - list_add_tail(instrs, &expr->node.entry); + list_add_tail(instrs, &expr->entry); - return &expr->node; + return expr; } static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass a location pointer to init_node().
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 6b45f290f798f19d7e8b49435397b5fe37f87c3e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6b45f290f798f19d7e8b49435397b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 19:21:34 2022 -0500 vkd3d-shader/hlsl: Pass a location pointer to init_node(). Instead of a flat location structure. --- libs/vkd3d-shader/hlsl.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f0426620..3edbb978 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -836,12 +836,12 @@ void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_va } static void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, - struct hlsl_type *data_type, struct vkd3d_shader_location loc) + struct hlsl_type *data_type, const struct vkd3d_shader_location *loc) { memset(node, 0, sizeof(*node)); node->type = type; node->data_type = data_type; - node->loc = loc; + node->loc = *loc; list_init(&node->uses); } @@ -864,7 +864,7 @@ struct hlsl_ir_store *hlsl_new_store_index(struct hlsl_ctx *ctx, const struct hl if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; - init_node(&store->node, HLSL_IR_STORE, NULL, *loc); + init_node(&store->node, HLSL_IR_STORE, NULL, loc); if (!init_deref(ctx, &store->lhs, lhs->var, lhs->path_len + !!idx)) return NULL; @@ -892,7 +892,7 @@ struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; - init_node(&store->node, HLSL_IR_STORE, NULL, rhs->loc); + init_node(&store->node, HLSL_IR_STORE, NULL, &rhs->loc); if (!init_deref_from_component_index(ctx, &comp_path_block, &store->lhs, lhs, comp, &rhs->loc)) { @@ -920,7 +920,7 @@ struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_typ if (!(c = hlsl_alloc(ctx, sizeof(*c)))) return NULL; - init_node(&c->node, HLSL_IR_CONSTANT, type, *loc); + init_node(&c->node, HLSL_IR_CONSTANT, type, loc); return c; } @@ -981,7 +981,7 @@ struct hlsl_ir_node *hlsl_new_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) return NULL; - init_node(&expr->node, HLSL_IR_EXPR, data_type, *loc); + init_node(&expr->node, HLSL_IR_EXPR, data_type, loc); expr->op = op; for (i = 0; i < HLSL_MAX_OPERANDS; ++i) hlsl_src_from_node(&expr->operands[i], operands[i]); @@ -1011,7 +1011,7 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condit if (!(iff = hlsl_alloc(ctx, sizeof(*iff)))) return NULL; - init_node(&iff->node, HLSL_IR_IF, NULL, loc); + init_node(&iff->node, HLSL_IR_IF, NULL, &loc); hlsl_src_from_node(&iff->condition, condition); list_init(&iff->then_instrs.instrs); list_init(&iff->else_instrs.instrs); @@ -1033,7 +1033,7 @@ struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl if (!(load = hlsl_alloc(ctx, sizeof(*load)))) return NULL; - init_node(&load->node, HLSL_IR_LOAD, type, *loc); + init_node(&load->node, HLSL_IR_LOAD, type, loc); if (!init_deref(ctx, &load->src, deref->var, deref->path_len + !!idx)) { @@ -1071,7 +1071,7 @@ struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b type = get_type_from_deref(ctx, deref); comp_type = hlsl_type_get_component_type(ctx, type, comp); - init_node(&load->node, HLSL_IR_LOAD, comp_type, *loc); + init_node(&load->node, HLSL_IR_LOAD, comp_type, loc); if (!init_deref_from_component_index(ctx, &comp_path_block, &load->src, deref, comp, loc)) { @@ -1092,7 +1092,7 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, if (!(load = hlsl_alloc(ctx, sizeof(*load)))) return NULL; - init_node(&load->node, HLSL_IR_RESOURCE_LOAD, params->format, *loc); + init_node(&load->node, HLSL_IR_RESOURCE_LOAD, params->format, loc); load->load_type = params->type; if (!hlsl_copy_deref(ctx, &load->resource, &params->resource)) { @@ -1119,7 +1119,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - hlsl_get_vector_type(ctx, val->data_type->base_type, components), *loc); + hlsl_get_vector_type(ctx, val->data_type->base_type, components), loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; @@ -1131,7 +1131,7 @@ struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type if (!(jump = hlsl_alloc(ctx, sizeof(*jump)))) return NULL; - init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + init_node(&jump->node, HLSL_IR_JUMP, NULL, &loc); jump->type = type; return jump; } @@ -1142,7 +1142,7 @@ struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_loc if (!(loop = hlsl_alloc(ctx, sizeof(*loop)))) return NULL; - init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + init_node(&loop->node, HLSL_IR_LOOP, NULL, &loc); list_init(&loop->body.instrs); return loop; }

1 0

Jeremy Newman : take down wineconf post
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: website Branch: master Commit: 64c506f14d59cf9aa78030e22846266db9c73b1f URL: https://gitlab.winehq.org/winehq/winehq/-/commit/64c506f14d59cf9aa78030e228… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Oct 12 09:43:18 2022 -0500 take down wineconf post --- templates/en/home.template | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index 255a8fd0..aead4387 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -169,14 +169,7 @@ <div class="whq-page-container margin-top-md"> - <h2 class="title"><a href="https://indico.freedesktop.org/event/2/page/11-overview">WineConf 2022</a></h2> - - <p>Come join us at the annual Wine developers conference being held in Minneapolis, MN on October 5th and 6th.<br> - This year, we are holding the conference in conjunction with <a href="https://www.x.org/">Xorg</a> and <a href="https://fossxr.dev/">FOSSXR</a>, so it should be an especially good time.</p> - - <p class="margin-bottom-md"><a href="https://indico.freedesktop.org/event/2/page/11-overview" class="btn btn-default"><i class="fa fa-info-circle"></i> Read More</a></p> - - <h2 class="title margin-top-md"><a href="{$root}/news">News and Updates</a></h2> + <h2 class="title"><a href="{$root}/news">News and Updates</a></h2>

1 0