- Wine-Commits - list.winehq.org

Alex Henrie : winemenubuilder: Skip desktop integration for certain associations.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: 9d80b367ce0746b98a221f3b72e03da758af7c20 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d80b367ce0746b98a221f3b72e03d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 5 19:26:38 2023 -0600 winemenubuilder: Skip desktop integration for certain associations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 --- programs/winemenubuilder/winemenubuilder.c | 54 +++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 1579ca8dafa..ae657d87bb1 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1974,6 +1974,46 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } +static BOOL on_exclude_list(const WCHAR *command) +{ + static const WCHAR default_exclude_list[] = L"ieframe.dll\0iexplore.exe\0notepad.exe\0" + L"winebrowser.exe\0wordpad.exe\0"; + WCHAR *exclude_list = NULL; + const WCHAR *pattern; + HKEY key; + DWORD size; + LSTATUS status; + BOOL found = FALSE; + + if ((key = open_associations_reg_key())) + { + status = RegGetValueW(key, NULL, L"Exclude", RRF_RT_REG_MULTI_SZ, NULL, NULL, &size); + if (status == ERROR_SUCCESS) + { + exclude_list = xmalloc(size); + status = RegGetValueW(key, NULL, L"Exclude", RRF_RT_REG_MULTI_SZ, NULL, exclude_list, &size); + if (status != ERROR_SUCCESS) + { + heap_free(exclude_list); + exclude_list = NULL; + } + } + RegCloseKey(key); + } + + for (pattern = exclude_list ? exclude_list : default_exclude_list; *pattern; pattern += wcslen(pattern) + 1) + { + if (wcsstr(command, pattern)) + { + found = TRUE; + break; + } + } + + heap_free(exclude_list); + return found; +} + static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) @@ -2054,6 +2094,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (on_exclude_list(commandW)) + /* command is on the exclude list => desktop integration is not desirable */ + goto end; + wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); @@ -2093,11 +2142,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, L"open"); if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL);

1 0

Tim Clem : ntdll: Decrement thread count from exit_thread and exit the process if needed.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: fac1aabbef3753afc53a4ea4f933b3d0516fd302 URL: https://gitlab.winehq.org/wine/wine/-/commit/fac1aabbef3753afc53a4ea4f933b3… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Apr 24 11:51:31 2023 -0700 ntdll: Decrement thread count from exit_thread and exit the process if needed. --- dlls/ntdll/unix/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 2686a8365cf..d76de4fcc98 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1429,6 +1429,8 @@ static DECLSPEC_NORETURN void exit_thread( int status ) pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); + if (InterlockedDecrement( &nb_threads ) <= 0) exit_process( status ); + if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch;

1 0

Zhiyi Zhang : findstr: Add basic functionality.
by Alexandre Julliard May 2, 2023

May 2, 2023

1 0

Zhiyi Zhang : tasklist: Partially support '/fi' option.
by Alexandre Julliard May 2, 2023

May 2, 2023

1 0

Zhiyi Zhang : tasklist: Support '/fo' option.
by Alexandre Julliard May 2, 2023

May 2, 2023

1 0

Zhiyi Zhang : tasklist: Support '/nh' option.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: 8238c1d48fe4d867d746579c0b79ffa6df6c738b URL: https://gitlab.winehq.org/wine/wine/-/commit/8238c1d48fe4d867d746579c0b79ff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 18 17:59:07 2023 +0800 tasklist: Support '/nh' option. --- programs/tasklist/tasklist.c | 21 +++++++++++++++------ programs/tasklist/tasklist.h | 5 +++++ programs/tasklist/tests/tasklist.c | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c index 687b8bf6985..48d9b438e84 100644 --- a/programs/tasklist/tasklist.c +++ b/programs/tasklist/tasklist.c @@ -163,17 +163,21 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru return TRUE; } -static void tasklist_print(void) +static void tasklist_print(const struct tasklist_options *options) { struct tasklist_process_info header, info; PROCESSENTRY32W *process_list; DWORD process_count, i; wprintf(L"\n"); - tasklist_get_header(&header); - wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n" - L"========================= ======== ================ =========== ============\n", - header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage); + + if (!options->no_header) + { + tasklist_get_header(&header); + wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n" + L"========================= ======== ================ =========== ============\n", + header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage); + } process_list = enumerate_processes(&process_count); for (i = 0; i < process_count; ++i) @@ -189,6 +193,7 @@ static void tasklist_print(void) int __cdecl wmain(int argc, WCHAR *argv[]) { + struct tasklist_options options = {0}; int i; for (i = 0; i < argc; i++) @@ -202,12 +207,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) tasklist_message(STRING_USAGE); return 0; } + else if (!wcsicmp(argv[i], L"/nh")) + { + options.no_header = TRUE; + } else { WINE_WARN("Ignoring option %s\n", wine_dbgstr_w(argv[i])); } } - tasklist_print(); + tasklist_print(&options); return 0; } diff --git a/programs/tasklist/tasklist.h b/programs/tasklist/tasklist.h index 707121680ec..6add1f30277 100644 --- a/programs/tasklist/tasklist.h +++ b/programs/tasklist/tasklist.h @@ -36,3 +36,8 @@ struct tasklist_process_info WCHAR session_number[32]; WCHAR memory_usage[32]; }; + +struct tasklist_options +{ + BOOL no_header; +}; diff --git a/programs/tasklist/tests/tasklist.c b/programs/tasklist/tests/tasklist.c index cd4a2be0178..2c4d77855b0 100644 --- a/programs/tasklist/tests/tasklist.c +++ b/programs/tasklist/tests/tasklist.c @@ -108,6 +108,20 @@ static void test_basic(void) ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size); } +static void test_no_header(void) +{ + char *pos; + + /* /nh */ + run_tasklist("/nh", 0); + ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size); + pos = strstr(stdout_buffer, "Image Name"); + ok(!pos, "Got header.\n"); + pos = strstr(stdout_buffer, "="); + ok(!pos, "Got header.\n"); +} + START_TEST(tasklist) { if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) @@ -117,4 +131,5 @@ START_TEST(tasklist) } test_basic(); + test_no_header(); }

1 0

Zhiyi Zhang : tasklist: Add basic functionality.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: 62af0b5f84a4b846d6c392f3acdcc8f8240d72a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/62af0b5f84a4b846d6c392f3acdcc8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 14 17:14:42 2023 +0800 tasklist: Add basic functionality. Company of Heroes: Battle of Crete needs a functioning tasklist.exe to exit properly. --- configure | 1 + configure.ac | 1 + po/ar.po | 52 +++++-- po/ast.po | 52 +++++-- po/bg.po | 49 +++++-- po/ca.po | 52 +++++-- po/cs.po | 52 +++++-- po/da.po | 52 +++++-- po/de.po | 52 +++++-- po/el.po | 45 +++++-- po/en.po | 44 ++++-- po/en_US.po | 44 ++++-- po/eo.po | 52 +++++-- po/es.po | 52 +++++-- po/fa.po | 47 +++++-- po/fi.po | 52 +++++-- po/fr.po | 52 +++++-- po/he.po | 52 +++++-- po/hi.po | 44 ++++-- po/hr.po | 52 +++++-- po/hu.po | 52 +++++-- po/it.po | 52 +++++-- po/ja.po | 52 +++++-- po/ko.po | 52 +++++-- po/lt.po | 52 +++++-- po/ml.po | 48 +++++-- po/nb_NO.po | 52 +++++-- po/nl.po | 52 +++++-- po/or.po | 44 ++++-- po/pa.po | 44 ++++-- po/pl.po | 52 +++++-- po/pt_BR.po | 52 +++++-- po/pt_PT.po | 52 +++++-- po/rm.po | 46 +++++-- po/ro.po | 52 +++++-- po/ru.po | 52 +++++-- po/si.po | 52 +++++-- po/sk.po | 49 +++++-- po/sl.po | 52 +++++-- po/sr_RS(a)cyrillic.po | 53 ++++++-- po/sr_RS(a)latin.po | 53 ++++++-- po/sv.po | 52 +++++-- po/ta.po | 50 +++++-- po/te.po | 44 ++++-- po/th.po | 47 +++++-- po/tr.po | 52 +++++-- po/uk.po | 52 +++++-- po/wa.po | 46 +++++-- po/wine.pot | 44 ++++-- po/zh_CN.po | 52 +++++-- po/zh_TW.po | 52 +++++-- programs/tasklist/Makefile.in | 3 +- programs/tasklist/tasklist.c | 186 +++++++++++++++++++++++++- programs/tasklist/tasklist.h | 38 ++++++ programs/tasklist/{version.rc => tasklist.rc} | 18 +++ programs/tasklist/tests/Makefile.in | 4 + programs/tasklist/tests/tasklist.c | 120 +++++++++++++++++ 57 files changed, 2229 insertions(+), 595 deletions(-)

1 0

Conor McCarthy : vkd3d: Do not reset the descriptor heap count unless full or the command list is reset.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: vkd3d Branch: master Commit: e2dac061e26f6b0404f680ca33ccc3e0443ede6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e2dac061e26f6b0404f680ca33ccc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue May 2 16:40:30 2023 +1000 vkd3d: Do not reset the descriptor heap count unless full or the command list is reset. The same heaps must be flushed again if the command list is executed again without a reset. --- libs/vkd3d/command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 81ddccb4..dd5c78a4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2463,6 +2463,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers)); memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets)); + list->descriptor_heap_count = 0; + ID3D12GraphicsCommandList2_SetPipelineState(iface, initial_pipeline_state); } @@ -3181,7 +3183,6 @@ static void command_list_flush_vk_heap_updates(struct d3d12_command_list *list) d3d12_desc_flush_vk_heap_updates_locked(list->descriptor_heaps[i], device); vkd3d_mutex_unlock(&list->descriptor_heaps[i]->vk_sets_mutex); } - list->descriptor_heap_count = 0; } static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *list, @@ -3215,6 +3216,7 @@ static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *l /* Descriptors can be written after binding. */ FIXME("Flushing descriptor updates while list %p is not closed.\n", list); command_list_flush_vk_heap_updates(list); + list->descriptor_heap_count = 0; } list->descriptor_heaps[list->descriptor_heap_count++] = heap; }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement asfloat().
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: vkd3d Branch: master Commit: 87037d37482ea9664462edaaa8c0a4c435e28e90 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/87037d37482ea9664462edaaa8c0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 04:02:09 2023 +0200 vkd3d-shader/hlsl: Implement asfloat(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 24 ++++++++++++++++++++++++ tests/asfloat.shader_test | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/Makefile.am b/Makefile.am index e8375cad..f7c5c9a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ vkd3d_shader_tests = \ tests/arithmetic-int-uniform.shader_test \ tests/arithmetic-uint.shader_test \ tests/array-parameters.shader_test \ + tests/asfloat.shader_test \ tests/asuint.shader_test \ tests/bitwise.shader_test \ tests/bool-semantics.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2d08d18b..1ce65e84 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2508,6 +2508,29 @@ static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx, return hlsl_get_numeric_type(ctx, type->class, base_type, type->dimx, type->dimy); } +static bool intrinsic_asfloat(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; + + 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 argument type of asfloat(): 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_FLOAT); + + operands[0] = params->args[0]; + return add_expr(ctx, params->instrs, HLSL_OP1_REINTERPRET, operands, data_type, loc); +} + static bool intrinsic_asuint(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3461,6 +3484,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"all", 1, true, intrinsic_all}, {"any", 1, true, intrinsic_any}, + {"asfloat", 1, true, intrinsic_asfloat}, {"asuint", -1, true, intrinsic_asuint}, {"clamp", 3, true, intrinsic_clamp}, {"cos", 1, true, intrinsic_cos}, diff --git a/tests/asfloat.shader_test b/tests/asfloat.shader_test new file mode 100644 index 00000000..9c0d9373 --- /dev/null +++ b/tests/asfloat.shader_test @@ -0,0 +1,48 @@ +[require] +shader model >= 4.0 + +[pixel shader] +float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv_target +{ + float4 ret; + + ret.x = asfloat(f); + ret.y = asfloat(i); + ret.z = asfloat(u); + ret.w = asfloat(h); + return ret; +} + +[test] +uniform 0 float4 123.0 -2.0 456 0.01 +draw quad +probe (320,240) rgba (123.0, -2.0, 456.0, 0.01) + +[pixel shader] +float4 main(uniform float2x2 m, uniform float4 v) : sv_target +{ + return float4(asfloat(m)[0][1], asfloat(v).y, 0, 0); +} + +[test] +uniform 0 float4 11 12 0 0 +uniform 4 float4 13 14 0 0 +uniform 8 float4 20 21 22 23 +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 asfloat(b); +} + +[pixel shader fail] +float4 main() : sv_target +{ + double d = 1.0; + + return asfloat(d); +}

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_resource_load().
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: vkd3d Branch: master Commit: 3cc18f1e9f50474fdd99f01e191c1bc92a1de713 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3cc18f1e9f50474fdd99f01e191c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 20:38:31 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_resource_load(). --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 25 ++++++++++++------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ab41849e..1ef38495 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1298,7 +1298,7 @@ struct hlsl_ir_node *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b return &load->node; } -struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, +struct hlsl_ir_node *hlsl_new_resource_load(struct hlsl_ctx *ctx, const struct hlsl_resource_load_params *params, const struct vkd3d_shader_location *loc) { struct hlsl_ir_resource_load *load; @@ -1327,7 +1327,7 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, hlsl_src_from_node(&load->coords, params->coords); hlsl_src_from_node(&load->texel_offset, params->texel_offset); hlsl_src_from_node(&load->lod, params->lod); - return load; + return &load->node; } struct hlsl_ir_resource_store *hlsl_new_resource_store(struct hlsl_ctx *ctx, const struct hlsl_deref *resource, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a18d49c6..835a4192 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1111,7 +1111,7 @@ struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *v struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_loop(struct hlsl_ctx *ctx, struct hlsl_block *block, const struct vkd3d_shader_location *loc); -struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, +struct hlsl_ir_node *hlsl_new_resource_load(struct hlsl_ctx *ctx, const struct hlsl_resource_load_params *params, const struct vkd3d_shader_location *loc); struct hlsl_ir_resource_store *hlsl_new_resource_store(struct hlsl_ctx *ctx, const struct hlsl_deref *resource, struct hlsl_ir_node *coords, struct hlsl_ir_node *value, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 635b6fab..99de0f22 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -757,7 +757,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h { struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_LOAD}; unsigned int dim_count = hlsl_sampler_dim_count(expr_type->sampler_dim); - struct hlsl_ir_resource_load *resource_load; + struct hlsl_ir_node *resource_load; if (index_type->class > HLSL_CLASS_VECTOR || index_type->dimx != dim_count) { @@ -783,7 +783,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h if (!(resource_load = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - list_add_tail(instrs, &resource_load->node.entry); + list_add_tail(instrs, &resource_load->entry); return true; } @@ -3300,8 +3300,7 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * { struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_SAMPLE}; const struct hlsl_type *sampler_type; - struct hlsl_ir_resource_load *load; - struct hlsl_ir_node *coords; + struct hlsl_ir_node *coords, *load; if (params->args_count != 2 && params->args_count != 4) { @@ -3338,7 +3337,7 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - list_add_tail(params->instrs, &load->node.entry); + list_add_tail(params->instrs, &load->entry); return true; } @@ -3731,7 +3730,7 @@ static bool add_load_method_call(struct hlsl_ctx *ctx, struct list *instrs, stru const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_LOAD}; - struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *load; bool multisampled; multisampled = object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS @@ -3771,7 +3770,7 @@ static bool add_load_method_call(struct hlsl_ctx *ctx, struct list *instrs, stru if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - list_add_tail(instrs, &load->node.entry); + list_add_tail(instrs, &load->entry); return true; } @@ -3783,7 +3782,7 @@ static bool add_sample_method_call(struct hlsl_ctx *ctx, struct list *instrs, st const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_SAMPLE}; const struct hlsl_type *sampler_type; - struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *load; if (params->args_count < 2 || params->args_count > 4 + !!offset_dim) { @@ -3828,7 +3827,7 @@ static bool add_sample_method_call(struct hlsl_ctx *ctx, struct list *instrs, st if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - list_add_tail(instrs, &load->node.entry); + list_add_tail(instrs, &load->entry); return true; } @@ -3841,7 +3840,7 @@ static bool add_gather_method_call(struct hlsl_ctx *ctx, struct list *instrs, st const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); struct hlsl_resource_load_params load_params = {0}; const struct hlsl_type *sampler_type; - struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *load; unsigned int read_channel; if (!strcmp(name, "GatherGreen")) @@ -3927,7 +3926,7 @@ static bool add_gather_method_call(struct hlsl_ctx *ctx, struct list *instrs, st if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - list_add_tail(instrs, &load->node.entry); + list_add_tail(instrs, &load->entry); return true; } @@ -3939,7 +3938,7 @@ static bool add_sample_lod_method_call(struct hlsl_ctx *ctx, struct list *instrs const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; - struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *load; if (!strcmp(name, "SampleLevel")) load_params.type = HLSL_RESOURCE_SAMPLE_LOD; @@ -3991,7 +3990,7 @@ static bool add_sample_lod_method_call(struct hlsl_ctx *ctx, struct list *instrs if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - list_add_tail(instrs, &load->node.entry); + list_add_tail(instrs, &load->entry); return true; }

1 0