October 2023 - Wine-commits

Ally Sommers : server: Move getpeername() implementation from ntdll/unix.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 3582ba9dc4b711747cdd52f285a5243b9278db6e URL: https://gitlab.winehq.org/wine/wine/-/commit/3582ba9dc4b711747cdd52f285a524… Author: Ally Sommers <dropbear.sh(a)gmail.com> Date: Thu Jun 15 11:51:33 2023 -0700 server: Move getpeername() implementation from ntdll/unix. This brings getpeername() in line with getsockname(), which is also implemented in wineserver. It also allows getpeername() to return a possibly-more-accurate peer name, as in the case of AF_UNIX sockets. --- dlls/ntdll/unix/socket.c | 24 ++----------------- dlls/ws2_32/socket.c | 13 ++++++----- dlls/ws2_32/tests/sock.c | 28 +++++++++------------- server/sock.c | 61 +++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 78 insertions(+), 48 deletions(-)

1 0

Brendan Shanks : winemac.drv: Use @autoreleasepool instead of NSAutoreleasePool.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: c937e991e1acad45c78a3b5a2977cef11a6b9f89 URL: https://gitlab.winehq.org/wine/wine/-/commit/c937e991e1acad45c78a3b5a2977ce… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 4 22:08:00 2023 -0700 winemac.drv: Use @autoreleasepool instead of NSAutoreleasePool. --- dlls/winemac.drv/cocoa_app.m | 64 +++++++++++----------- dlls/winemac.drv/cocoa_clipboard.m | 5 +- dlls/winemac.drv/cocoa_display.m | 21 ++++---- dlls/winemac.drv/cocoa_event.m | 57 ++++++++++---------- dlls/winemac.drv/cocoa_main.m | 54 ++++++++++--------- dlls/winemac.drv/cocoa_opengl.m | 29 +++++----- dlls/winemac.drv/cocoa_window.m | 105 +++++++++++++++++++------------------ 7 files changed, 172 insertions(+), 163 deletions(-)

1 0

Brendan Shanks : winemac.drv: Simplify control flow where possible after the removal of NSAutoreleasePool.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 29260f77fbe5f04b010f3d18878e33bd69761597 URL: https://gitlab.winehq.org/wine/wine/-/commit/29260f77fbe5f04b010f3d18878e33… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 4 22:08:19 2023 -0700 winemac.drv: Simplify control flow where possible after the removal of NSAutoreleasePool. --- dlls/winemac.drv/cocoa_display.m | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 5932e8070b1..2f3d86b51d5 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -60,8 +60,6 @@ int macdrv_get_displays(struct macdrv_display** displays, int* count) { @autoreleasepool { - int ret = -1; - NSArray* screens = [NSScreen screens]; if (screens) { @@ -92,11 +90,11 @@ int macdrv_get_displays(struct macdrv_display** displays, int* count) *displays = disps; *count = num_screens; - ret = 0; + return 0; } } - return ret; + return -1; } } @@ -307,25 +305,24 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) BOOL hide_integrated = FALSE; int primary_index = 0, i; int gpu_count = 0; - int ret = -1; /* Test if Metal is available */ if (&MTLCopyAllDevices == NULL) - goto done; + return -1; NSArray<id<MTLDevice>>* devices = [MTLCopyAllDevices() autorelease]; if (!devices.count || ![devices[0] respondsToSelector:@selector(registryID)]) - goto done; + return -1; gpus = calloc(devices.count, sizeof(*gpus)); if (!gpus) - goto done; + return -1; /* Use MTLCreateSystemDefaultDevice instead of CGDirectDisplayCopyCurrentMetalDevice(CGMainDisplayID()) to get * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps * using the integrated GPU. This is the behavior of Windows on a Mac. */ primary_device = [MTLCreateSystemDefaultDevice() autorelease]; if (macdrv_get_gpu_info_from_mtldevice(&primary_gpu, primary_device)) - goto done; + goto fail; /* Hide the integrated GPU if the system default device is a dedicated GPU */ if (!primary_device.isLowPower) @@ -337,7 +334,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) for (i = 0; i < devices.count; i++) { if (macdrv_get_gpu_info_from_mtldevice(&gpus[gpu_count], devices[i])) - goto done; + goto fail; if (hide_integrated && devices[i].isLowPower) { @@ -362,11 +359,10 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) *new_gpus = gpus; *count = gpu_count; - ret = 0; -done: - if (ret) - macdrv_free_gpus(gpus); - return ret; + return 0; +fail: + macdrv_free_gpus(gpus); + return -1; } } @@ -382,18 +378,16 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp @autoreleasepool { id<MTLDevice> device; - int ret = -1; /* Test if Metal is available */ if (&CGDirectDisplayCopyCurrentMetalDevice == NULL) - goto done; + return -1; device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) - ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); - -done: - return ret; + return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + else + return -1; } }

1 0

Francisco Casas : vkd3d-shader/tpf: Apply mask to swizzle when swizzle type is scalar.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: 0a5fa80f0204e7c757c7c1a9498988175056568f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a5fa80f0204e7c757c7c1a949898… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jul 18 20:21:45 2023 -0400 vkd3d-shader/tpf: Apply mask to swizzle when swizzle type is scalar. In native's output, for scalar swizzles only the first component of the swizzle is written, the others are left as zero. --- libs/vkd3d-shader/tpf.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index b72f4839..21298aba 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3913,8 +3913,13 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk token |= reg_dim << VKD3D_SM4_DIMENSION_SHIFT; if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) { - token |= (uint32_t)register_type_info->default_src_swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; - token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; + uint32_t swizzle_type = (uint32_t)register_type_info->default_src_swizzle_type; + + token |= swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + if (swizzle_type == VKD3D_SM4_SWIZZLE_SCALAR) + token |= (swizzle_to_sm4(src->swizzle) & 0x3) << VKD3D_SM4_SWIZZLE_SHIFT; + else + token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; } switch (src->modifiers)

1 0

Francisco Casas : vkd3d-shader/tpf: Don't store sm4 instruction extra bits in the opcode.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: 88b644a11dfbe261aa80d66a3ec2c73def75d1e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/88b644a11dfbe261aa80d66a3ec2c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 1 22:28:54 2023 -0400 vkd3d-shader/tpf: Don't store sm4 instruction extra bits in the opcode. Adding extra bits to instr->opcode doesn't seem correct, given that it is an enum. For instance, get_opcode_info() would return NULL if additional bits are added to instr->opcode. This is not a problem now because that function is called when reading and not writing. --- libs/vkd3d-shader/tpf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 21298aba..34a7da54 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3632,6 +3632,7 @@ static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_mod struct sm4_instruction { enum vkd3d_sm4_opcode opcode; + uint32_t extra_bits; struct sm4_instruction_modifier modifiers[1]; unsigned int modifier_count; @@ -3981,7 +3982,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4_instruction *instr) { struct vkd3d_bytecode_buffer *buffer = tpf->buffer; - uint32_t token = instr->opcode; + uint32_t token = instr->opcode | instr->extra_bits; unsigned int size, i, j; size_t token_position; @@ -4076,7 +4077,7 @@ static void write_sm4_dcl_samplers(const struct tpf_writer *tpf, const struct ex component_type = hlsl_type_get_component_type(tpf->ctx, resource->data_type, 0); if (component_type->sampler_dim == HLSL_SAMPLER_DIM_COMPARISON) - instr.opcode |= VKD3D_SM4_SAMPLER_COMPARISON << VKD3D_SM4_SAMPLER_MODE_SHIFT; + instr.extra_bits |= VKD3D_SM4_SAMPLER_COMPARISON << VKD3D_SM4_SAMPLER_MODE_SHIFT; assert(resource->regset == HLSL_REGSET_SAMPLERS); @@ -4135,12 +4136,12 @@ static void write_sm4_dcl_textures(const struct tpf_writer *tpf, const struct ex { instr.opcode = VKD3D_SM4_OP_DCL_RESOURCE; } - instr.opcode |= (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); + instr.extra_bits |= (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); if (component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS || component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY) { - instr.opcode |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; + instr.extra_bits |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; } write_sm4_instruction(tpf, &instr); @@ -4217,7 +4218,7 @@ static void write_sm4_dcl_semantic(const struct tpf_writer *tpf, const struct hl if ((var->storage_modifiers & HLSL_STORAGE_NOINTERPOLATION) || type_is_integer(var->data_type)) mode = VKD3DSIM_CONSTANT; - instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + instr.extra_bits |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; } } else @@ -4575,7 +4576,7 @@ static void write_sm4_sampleinfo(const struct tpf_writer *tpf, const struct hlsl memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_SAMPLE_INFO; if (dst->data_type->base_type == HLSL_TYPE_UINT) - instr.opcode |= VKD3DSI_SAMPLE_INFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + instr.extra_bits |= VKD3DSI_SAMPLE_INFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1; @@ -4597,7 +4598,7 @@ static void write_sm4_resinfo(const struct tpf_writer *tpf, const struct hlsl_ir memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_RESINFO; if (dst->data_type->base_type == HLSL_TYPE_UINT) - instr.opcode |= VKD3DSI_RESINFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + instr.extra_bits |= VKD3DSI_RESINFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1;

1 0

Francisco Casas : vkd3d-shader/tpf: Use lookup table for opcode_info_from_sm4().
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: 014960b64bf5271303da74e18c380891e7de74d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/014960b64bf5271303da74e18c380… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jul 27 18:34:26 2023 -0400 vkd3d-shader/tpf: Use lookup table for opcode_info_from_sm4(). Makes get_opcode_info() and thus, tpf reading a little faster. --- libs/vkd3d-shader/tpf.c | 599 ++++++++++++++++++++++++------------------------ 1 file changed, 302 insertions(+), 297 deletions(-)

1 0

Andrey Gusev : vkd3d: Add ID3D12GraphicsCommandList5 interface stub.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: 8087cc01f72517e418e5e8a5d83acfa0a680f0ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8087cc01f72517e418e5e8a5d83ac… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 4 14:11:47 2023 +0300 vkd3d: Add ID3D12GraphicsCommandList5 interface stub. --- libs/vkd3d/command.c | 292 ++++++++++++++++++++++++--------------------- libs/vkd3d/device.c | 4 +- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 157 insertions(+), 141 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add fwidth() function.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: b5c0c9c22f3c646cfc3143b5d8e6200a9a45ab6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b5c0c9c22f3c646cfc3143b5d8e62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 7 02:09:36 2023 +0200 vkd3d-shader/hlsl: Add fwidth() function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 28 ++++++++++++++++++++++++++++ tests/hlsl/fwidth.shader_test | 26 ++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/Makefile.am b/Makefile.am index 744e4612..11df76ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,6 +93,7 @@ vkd3d_shader_tests = \ tests/hlsl/function-overload.shader_test \ tests/hlsl/function-return.shader_test \ tests/hlsl/function.shader_test \ + tests/hlsl/fwidth.shader_test \ tests/hlsl/gather-offset.shader_test \ tests/hlsl/gather.shader_test \ tests/hlsl/getdimensions.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a47246de..8c327c79 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2961,6 +2961,33 @@ static bool intrinsic_frac(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FRACT, arg, loc); } +static bool intrinsic_fwidth(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_function_decl *func; + struct hlsl_type *type; + char *body; + + static const char template[] = + "%s fwidth(%s x)\n" + "{\n" + " return abs(ddx(x)) + abs(ddy(x));\n" + "}"; + + if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) + return false; + type = params->args[0]->data_type; + + if (!(body = hlsl_sprintf_alloc(ctx, template, type->name, type->name))) + return false; + func = hlsl_compile_internal_function(ctx, "fwidth", body); + vkd3d_free(body); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + static bool intrinsic_ldexp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3690,6 +3717,7 @@ intrinsic_functions[] = {"floor", 1, true, intrinsic_floor}, {"fmod", 2, true, intrinsic_fmod}, {"frac", 1, true, intrinsic_frac}, + {"fwidth", 1, true, intrinsic_fwidth}, {"ldexp", 2, true, intrinsic_ldexp}, {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, diff --git a/tests/hlsl/fwidth.shader_test b/tests/hlsl/fwidth.shader_test new file mode 100644 index 00000000..e302505f --- /dev/null +++ b/tests/hlsl/fwidth.shader_test @@ -0,0 +1,26 @@ +[require] +shader model >= 3.0 + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + // Shader models < 4 don't add 0.5 to sv_position, so this adjustment is required to get the + // same outputs. + pos.x = floor(pos.x) + 0.5; + pos.y = floor(pos.y) + 0.5; + + pos /= 10.0; + float nonlinear = pos.x * pos.y - pos.x * (pos.x + 0.5); + float4 res = fwidth(nonlinear); + + // Each device may use either the coarse or the fine derivate, so use quantization. + return round(30 * res); +} + +[test] +draw quad +probe (10, 10) rgba (8.0, 8.0, 8.0, 8.0) +probe (11, 10) rgba (8.0, 8.0, 8.0, 8.0) +probe (12, 10) rgba (10.0, 10.0, 10.0, 10.0) +probe (16, 16) rgba (12.0, 12.0, 12.0, 12.0) +probe (150, 150) rgba (92.0, 92.0, 92.0, 92.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Make regset an output argument in hlsl_type_get_component_offset().
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: dfce1e7f4a8a9cad5a5b92232b10311852f7ea67 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfce1e7f4a8a9cad5a5b92232b103… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jun 9 16:55:21 2023 -0400 vkd3d-shader/hlsl: Make regset an output argument in hlsl_type_get_component_offset(). Components only span across a single regset, so instead of expecting the regset as input for the offset, hlsl_type_get_component_offset() can actually retrieve it. --- libs/vkd3d-shader/hlsl.c | 26 +++++++++++++++----------- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/tpf.c | 3 +-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 5fe9047b..ca1dca0c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -452,11 +452,11 @@ struct hlsl_type *hlsl_type_get_component_type(struct hlsl_ctx *ctx, struct hlsl } unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_type *type, - enum hlsl_regset regset, unsigned int index) + unsigned int index, enum hlsl_regset *regset) { + unsigned int offset[HLSL_REGSET_LAST + 1] = {0}; struct hlsl_type *next_type; - unsigned int offset = 0; - unsigned int idx; + unsigned int idx, r; while (!type_is_single_component(type)) { @@ -468,19 +468,22 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty case HLSL_CLASS_SCALAR: case HLSL_CLASS_VECTOR: case HLSL_CLASS_MATRIX: - if (regset == HLSL_REGSET_NUMERIC) - offset += idx; + offset[HLSL_REGSET_NUMERIC] += idx; break; case HLSL_CLASS_STRUCT: - offset += type->e.record.fields[idx].reg_offset[regset]; + for (r = 0; r <= HLSL_REGSET_LAST; ++r) + offset[r] += type->e.record.fields[idx].reg_offset[r]; break; case HLSL_CLASS_ARRAY: - if (regset == HLSL_REGSET_NUMERIC) - offset += idx * align(type->e.array.type->reg_size[regset], 4); - else - offset += idx * type->e.array.type->reg_size[regset]; + for (r = 0; r <= HLSL_REGSET_LAST; ++r) + { + if (r == HLSL_REGSET_NUMERIC) + offset[r] += idx * align(type->e.array.type->reg_size[r], 4); + else + offset[r] += idx * type->e.array.type->reg_size[r]; + } break; case HLSL_CLASS_OBJECT: @@ -493,7 +496,8 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty type = next_type; } - return offset; + *regset = hlsl_type_get_regset(type); + return offset[*regset]; } static bool init_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_ir_var *var, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f81083c0..2981fd92 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1232,7 +1232,7 @@ unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type, struct hlsl_type *hlsl_type_get_component_type(struct hlsl_ctx *ctx, struct hlsl_type *type, unsigned int index); unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_type *type, - enum hlsl_regset regset, unsigned int index); + unsigned int index, enum hlsl_regset *regset); bool hlsl_type_is_row_major(const struct hlsl_type *type); unsigned int hlsl_type_minor_size(const struct hlsl_type *type); unsigned int hlsl_type_major_size(const struct hlsl_type *type); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index fbd84583..de31bbcb 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3250,8 +3250,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un if (!hlsl_type_is_resource(component_type)) continue; - regset = hlsl_type_get_regset(component_type); - regset_offset = hlsl_type_get_component_offset(ctx, var->data_type, regset, k); + regset_offset = hlsl_type_get_component_offset(ctx, var->data_type, k, &regset); if (regset_offset > var->regs[regset].allocation_size) continue;

1 0

Francisco Casas : vkd3d-shader/hlsl: Avoid hlsl_type_get_regset() in sm4_get_extern_resources().
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: cd0e3786c390c53d77f09a2d7715a074eede696f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cd0e3786c390c53d77f09a2d7715a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jun 9 17:44:54 2023 -0400 vkd3d-shader/hlsl: Avoid hlsl_type_get_regset() in sm4_get_extern_resources(). --- libs/vkd3d-shader/tpf.c | 51 +++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index de31bbcb..45e9ad96 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3296,38 +3296,43 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un } else { + unsigned int r; + if (!hlsl_type_is_resource(var->data_type)) continue; - regset = hlsl_type_get_regset(var->data_type); - if (!var->regs[regset].allocated) - continue; - if (!(hlsl_array_reserve(ctx, (void **)&extern_resources, &capacity, *count + 1, - sizeof(*extern_resources)))) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { - sm4_free_extern_resources(extern_resources, *count); - *count = 0; - return NULL; - } + if (!var->regs[r].allocated) + continue; - if (!(name = hlsl_strdup(ctx, string_skip_tag(var->name)))) - { - sm4_free_extern_resources(extern_resources, *count); - *count = 0; - return NULL; - } + if (!(hlsl_array_reserve(ctx, (void **)&extern_resources, &capacity, *count + 1, + sizeof(*extern_resources)))) + { + sm4_free_extern_resources(extern_resources, *count); + *count = 0; + return NULL; + } + + if (!(name = hlsl_strdup(ctx, string_skip_tag(var->name)))) + { + sm4_free_extern_resources(extern_resources, *count); + *count = 0; + return NULL; + } - extern_resources[*count].var = var; + extern_resources[*count].var = var; - extern_resources[*count].name = name; - extern_resources[*count].data_type = var->data_type; - extern_resources[*count].is_user_packed = !!var->reg_reservation.reg_type; + extern_resources[*count].name = name; + extern_resources[*count].data_type = var->data_type; + extern_resources[*count].is_user_packed = !!var->reg_reservation.reg_type; - extern_resources[*count].regset = regset; - extern_resources[*count].id = var->regs[regset].id; - extern_resources[*count].bind_count = var->bind_count[regset]; + extern_resources[*count].regset = r; + extern_resources[*count].id = var->regs[r].id; + extern_resources[*count].bind_count = var->bind_count[r]; - ++*count; + ++*count; + } } }

1 0