August 2021 - Wine-commits - list.winehq.org

Gerald Pfeifer : nsiproxy: Include netinet/in.h in udp.c.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: f153ce2dabcaad860c54c0580019054e6bf9dc26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f153ce2dabcaad860c54c058… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Aug 20 16:11:52 2021 +0200 nsiproxy: Include netinet/in.h in udp.c. This is necessary to define struct in_addr which is used by netinet/ip.h on FreeBSD. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 9f9966815c2..190eb7f21f5 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -38,6 +38,10 @@ #include <sys/socketvar.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif

1 0

Zebediah Figura : server: Remove support for waiting on an IRP object.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 10ca57f4f56f86b433686afbdbe140ba54b239bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ca57f4f56f86b433686afb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 21 14:29:50 2021 -0500 server: Remove support for waiting on an IRP object. This was initially used to let the client wait on IRP completion; c56c42ff79515a79b1913d31e21d6fecd7c11ef5 changed it to use the async handle instead. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/server/device.c b/server/device.c index 6400751e339..b669921a003 100644 --- a/server/device.c +++ b/server/device.c @@ -57,7 +57,6 @@ struct irp_call }; static void irp_call_dump( struct object *obj, int verbose ); -static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry ); static void irp_call_destroy( struct object *obj ); static const struct object_ops irp_call_ops = @@ -65,10 +64,10 @@ static const struct object_ops irp_call_ops = sizeof(struct irp_call), /* size */ &no_type, /* type */ irp_call_dump, /* dump */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - irp_call_signaled, /* signaled */ - no_satisfied, /* satisfied */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ default_map_access, /* map_access */ @@ -335,13 +334,6 @@ static void irp_call_dump( struct object *obj, int verbose ) fprintf( stderr, "IRP call file=%p\n", irp->file ); } -static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct irp_call *irp = (struct irp_call *)obj; - - return !irp->file; /* file is cleared once the irp has completed */ -} - static void irp_call_destroy( struct object *obj ) { struct irp_call *irp = (struct irp_call *)obj; @@ -411,7 +403,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, release_object( irp->async ); irp->async = NULL; } - wake_up( &irp->obj, 0 ); release_object( irp ); /* no longer on the device queue */ release_object( file );

1 0

Zebediah Figura : server: Remove a redundant NULL check for async->fd.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: d4b13ef9d63187d69c68e88ef7b67d61c2a3c50f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4b13ef9d63187d69c68e88e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 21 14:29:51 2021 -0500 server: Remove a redundant NULL check for async->fd. If the async has not been terminated yet, async->fd cannot be NULL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index dbd4859edc4..442d98d8c7a 100644 --- a/server/async.c +++ b/server/async.c @@ -448,7 +448,7 @@ restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { if (async->status != STATUS_PENDING) continue; - if ((!obj || (async->fd && get_fd_user( async->fd ) == obj)) && + if ((!obj || (get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) {

1 0

Zhiyi Zhang : light.msstyles: Add more Button HiDPI images.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: db4604b4d58a98939c16af61c86dce24b5759c87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db4604b4d58a98939c16af61… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 23 12:08:17 2021 +0800 light.msstyles: Add more Button HiDPI images. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 13 ++++ dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 0 -> 17466 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 48 ++++++++++++ dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 0 -> 23370 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 50 +++++++++++++ dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 0 -> 37770 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 40 ++++++++++ dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 0 -> 46266 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 46 ++++++++++++ .../light.msstyles/blue_commandlink_glyph_37px.bmp | Bin 0 -> 27518 bytes .../light.msstyles/blue_commandlink_glyph_37px.svg | 19 +++++ .../light.msstyles/blue_commandlink_glyph_52px.bmp | Bin 0 -> 54218 bytes .../light.msstyles/blue_commandlink_glyph_52px.svg | 19 +++++ .../light.msstyles/blue_commandlink_glyph_60px.bmp | Bin 0 -> 72138 bytes .../light.msstyles/blue_commandlink_glyph_60px.svg | 19 +++++ .../light.msstyles/blue_commandlink_glyph_67px.bmp | Bin 0 -> 89918 bytes .../light.msstyles/blue_commandlink_glyph_67px.svg | 19 +++++ .../light.msstyles/blue_commandlink_glyph_75px.bmp | Bin 0 -> 112638 bytes .../light.msstyles/blue_commandlink_glyph_75px.svg | 19 +++++ dlls/light.msstyles/blue_radiobutton_19px.bmp | Bin 0 -> 11690 bytes dlls/light.msstyles/blue_radiobutton_19px.svg | 28 +++++++ dlls/light.msstyles/blue_radiobutton_22px.bmp | Bin 0 -> 15626 bytes dlls/light.msstyles/blue_radiobutton_22px.svg | 28 +++++++ dlls/light.msstyles/blue_radiobutton_28px.bmp | Bin 0 -> 25226 bytes dlls/light.msstyles/blue_radiobutton_28px.svg | 28 +++++++ dlls/light.msstyles/blue_radiobutton_31px.bmp | Bin 0 -> 30890 bytes dlls/light.msstyles/blue_radiobutton_31px.svg | 28 +++++++ dlls/light.msstyles/light.rc | 81 +++++++++++++++++++-- 28 files changed, 477 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db4604b4d58a98939c16…

1 0

Zhiyi Zhang : light.msstyles: Add Scroll Bar gripper HiDPI images.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 0a82fe4cfed7149be549f20a37a023c0b91e0bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a82fe4cfed7149be549f20a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 23 12:08:34 2021 +0800 light.msstyles: Add Scroll Bar gripper HiDPI images. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 ++- ....bmp => blue_scrollbar_resizebox_grip_16px.bmp} | Bin 2314 -> 2186 bytes ....svg => blue_scrollbar_resizebox_grip_16px.svg} | 4 +- .../blue_scrollbar_resizebox_grip_20px.bmp | Bin 0 -> 3338 bytes .../blue_scrollbar_resizebox_grip_20px.svg | 26 ++++++++++ .../blue_scrollbar_resizebox_grip_24px.bmp | Bin 0 -> 4746 bytes .../blue_scrollbar_resizebox_grip_24px.svg | 26 ++++++++++ .../blue_scrollbar_resizebox_grip_28px.bmp | Bin 0 -> 6410 bytes .../blue_scrollbar_resizebox_grip_28px.svg | 26 ++++++++++ .../blue_scrollbar_resizebox_grip_32px.bmp | Bin 0 -> 8330 bytes .../blue_scrollbar_resizebox_grip_32px.svg | 26 ++++++++++ .../blue_scrollbar_resizebox_grip_36px.bmp | Bin 0 -> 10506 bytes .../blue_scrollbar_resizebox_grip_36px.svg | 26 ++++++++++ .../blue_scrollbar_resizebox_grip_40px.bmp | Bin 0 -> 12938 bytes .../blue_scrollbar_resizebox_grip_40px.svg | 26 ++++++++++ dlls/light.msstyles/light.rc | 56 +++++++++++++++++++-- 16 files changed, 216 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a82fe4cfed7149be549…

1 0

Zhiyi Zhang : light.msstyles: Add Tooltip HiDPI images.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 7bebabd998fcb7e553076d6241c6ef043ecb7156 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bebabd998fcb7e553076d62… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 23 12:08:44 2021 +0800 light.msstyles: Add Tooltip HiDPI images. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 ++++- dlls/light.msstyles/blue_tooltip_close.bmp | Bin 3402 -> 0 bytes dlls/light.msstyles/blue_tooltip_close.svg | 17 ----------- dlls/light.msstyles/blue_tooltip_close_16px.bmp | Bin 0 -> 3210 bytes dlls/light.msstyles/blue_tooltip_close_16px.svg | 17 +++++++++++ dlls/light.msstyles/blue_tooltip_close_20px.bmp | Bin 0 -> 4938 bytes dlls/light.msstyles/blue_tooltip_close_20px.svg | 17 +++++++++++ dlls/light.msstyles/blue_tooltip_close_24px.bmp | Bin 0 -> 7050 bytes dlls/light.msstyles/blue_tooltip_close_24px.svg | 17 +++++++++++ dlls/light.msstyles/blue_tooltip_close_28px.bmp | Bin 0 -> 9546 bytes dlls/light.msstyles/blue_tooltip_close_28px.svg | 17 +++++++++++ dlls/light.msstyles/blue_tooltip_close_32px.bmp | Bin 0 -> 12426 bytes dlls/light.msstyles/blue_tooltip_close_32px.svg | 17 +++++++++++ dlls/light.msstyles/blue_tooltip_close_36px.bmp | Bin 0 -> 15690 bytes dlls/light.msstyles/blue_tooltip_close_36px.svg | 17 +++++++++++ dlls/light.msstyles/blue_tooltip_close_40px.bmp | Bin 0 -> 19338 bytes dlls/light.msstyles/blue_tooltip_close_40px.svg | 17 +++++++++++ dlls/light.msstyles/light.rc | 38 ++++++++++++++++++++++-- 18 files changed, 161 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bebabd998fcb7e55307…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 signatures.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 464dae2c46b5880ade6fa46816dc01f3363bd52a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=464dae2c46b5880ade6fa46… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:27 2021 -0500 vkd3d-shader/hlsl: Write SM4 signatures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 14 +++ include/vkd3d_d3dcommon.idl | 37 ++++++++ libs/vkd3d-shader/hlsl.h | 6 ++ libs/vkd3d-shader/hlsl_codegen.c | 59 +++++++++--- libs/vkd3d-shader/hlsl_sm4.c | 200 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 300 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=464dae2c46b5880ade6…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 constant buffer declarations.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 5da4949f7c4aa39b5156ab6dbfa1af188ff4a748 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5da4949f7c4aa39b5156ab6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:28 2021 -0500 vkd3d-shader/hlsl: Write SM4 constant buffer declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 116 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 894c513..029dc3d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -549,10 +549,120 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) dxbc_writer_add_section(dxbc, TAG_RDEF, buffer.data, buffer.size); } +struct sm4_register +{ + enum vkd3d_sm4_register_type type; + uint32_t idx[2]; + unsigned int idx_count; + enum vkd3d_sm4_dimension dim; +}; + +struct sm4_instruction +{ + enum vkd3d_sm4_opcode opcode; + + struct + { + struct sm4_register reg; + unsigned int writemask; + } dst; + + struct + { + struct sm4_register reg; + unsigned int swizzle; + } srcs[2]; + unsigned int src_count; + + unsigned int has_dst; +}; + +static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) +{ + switch (type) + { + case VKD3D_SM4_RT_CONSTBUFFER: + return VKD3D_SM4_SWIZZLE_VEC4; + + default: + FIXME("Unhandled register type %#x.\n", type); + return VKD3D_SM4_SWIZZLE_VEC4; + } +} + +static uint32_t sm4_encode_register(const struct sm4_register *reg) +{ + return (reg->type << VKD3D_SM4_REGISTER_TYPE_SHIFT) + | (reg->idx_count << VKD3D_SM4_REGISTER_ORDER_SHIFT) + | (reg->dim << VKD3D_SM4_DIMENSION_SHIFT); +} + +static uint32_t sm4_register_order(const struct sm4_register *reg) +{ + uint32_t order = 1; + if (reg->type == VKD3D_SM4_RT_IMMCONST) + order += reg->dim == VKD3D_SM4_DIMENSION_VEC4 ? 4 : 1; + order += reg->idx_count; + return order; +} + +static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const struct sm4_instruction *instr) +{ + uint32_t token = instr->opcode; + unsigned int size = 1, i, j; + + if (instr->has_dst) + size += sm4_register_order(&instr->dst.reg); + for (i = 0; i < instr->src_count; ++i) + size += sm4_register_order(&instr->srcs[i].reg); + + token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + put_u32(buffer, token); + + if (instr->has_dst) + { + token = sm4_encode_register(&instr->dst.reg); + if (instr->dst.reg.dim == VKD3D_SM4_DIMENSION_VEC4) + token |= instr->dst.writemask << VKD3D_SM4_WRITEMASK_SHIFT; + put_u32(buffer, token); + + for (j = 0; j < instr->dst.reg.idx_count; ++j) + put_u32(buffer, instr->dst.reg.idx[j]); + } + + for (i = 0; i < instr->src_count; ++i) + { + token = sm4_encode_register(&instr->srcs[i].reg); + token |= sm4_swizzle_type(instr->srcs[i].reg.type) << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + token |= instr->srcs[i].swizzle << VKD3D_SM4_SWIZZLE_SHIFT; + put_u32(buffer, token); + + for (j = 0; j < instr->srcs[i].reg.idx_count; ++j) + put_u32(buffer, instr->srcs[i].reg.idx[j]); + } +} + +static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_buffer *cbuffer) +{ + const struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_DCL_CONSTANT_BUFFER, + + .srcs[0].reg.dim = VKD3D_SM4_DIMENSION_VEC4, + .srcs[0].reg.type = VKD3D_SM4_RT_CONSTBUFFER, + .srcs[0].reg.idx = {cbuffer->reg.id, (cbuffer->used_size + 3) / 4}, + .srcs[0].reg.idx_count = 2, + .srcs[0].swizzle = HLSL_SWIZZLE(X, Y, Z, W), + .src_count = 1, + }; + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; struct vkd3d_bytecode_buffer buffer = {0}; + const struct hlsl_buffer *cbuffer; static const uint16_t shader_types[VKD3D_SHADER_TYPE_COUNT] = { @@ -570,6 +680,12 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type])); put_u32(&buffer, 0); /* FIXME: instruction token count */ + LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) + { + if (cbuffer->reg.allocated) + write_sm4_dcl_constant_buffer(&buffer, cbuffer); + } + dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 semantic declarations.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 62456beedadb84a0e72c4c3230ced6d4d51b427d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62456beedadb84a0e72c4c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:29 2021 -0500 vkd3d-shader/hlsl: Write SM4 semantic declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 4 +- libs/vkd3d-shader/hlsl_sm4.c | 117 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 118 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9860ed7..80cea51 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -688,7 +688,7 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3D_NAME *usage); bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, uint32_t *reg); + bool output, enum vkd3d_sm4_register_type *type, bool *has_idx); int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 939b356..a1d6e8e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1048,6 +1048,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var else { D3D_NAME usage; + bool has_idx; if (!hlsl_sm4_usage_from_semantic(ctx, &var->semantic, output, &usage)) { @@ -1055,7 +1056,8 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var "Invalid semantic '%s'.", var->semantic.name); return; } - builtin = hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, &reg); + if ((builtin = hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, &has_idx))) + reg = has_idx ? var->semantic.index : 0; } if (builtin) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 029dc3d..92f854c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -24,7 +24,7 @@ #include "sm4.h" bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, uint32_t *reg) + bool output, enum vkd3d_sm4_register_type *type, bool *has_idx) { unsigned int i; @@ -56,7 +56,7 @@ bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_sem && ctx->profile->type == register_table[i].shader_type) { *type = register_table[i].type; - *reg = register_table[i].has_idx ? semantic->index : ~0u; + *has_idx = register_table[i].has_idx; return true; } } @@ -137,6 +137,7 @@ static void write_sm4_signature(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, enum vkd3d_sm4_register_type type; uint32_t usage_idx, reg_idx; D3D_NAME usage; + bool has_idx; if ((output && !var->is_output_semantic) || (!output && !var->is_input_semantic)) continue; @@ -145,7 +146,11 @@ static void write_sm4_signature(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, assert(ret); usage_idx = var->semantic.index; - if (!hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, &reg_idx)) + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, &has_idx)) + { + reg_idx = has_idx ? var->semantic.index : ~0u; + } + else { assert(var->reg.allocated); type = VKD3D_SM4_RT_INPUT; @@ -574,6 +579,9 @@ struct sm4_instruction } srcs[2]; unsigned int src_count; + uint32_t idx[2]; + unsigned int idx_count; + unsigned int has_dst; }; @@ -582,6 +590,7 @@ static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) switch (type) { case VKD3D_SM4_RT_CONSTBUFFER: + case VKD3D_SM4_RT_INPUT: return VKD3D_SM4_SWIZZLE_VEC4; default: @@ -615,6 +624,7 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st size += sm4_register_order(&instr->dst.reg); for (i = 0; i < instr->src_count; ++i) size += sm4_register_order(&instr->srcs[i].reg); + size += instr->idx_count; token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); put_u32(buffer, token); @@ -640,6 +650,9 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st for (j = 0; j < instr->srcs[i].reg.idx_count; ++j) put_u32(buffer, instr->srcs[i].reg.idx[j]); } + + for (j = 0; j < instr->idx_count; ++j) + put_u32(buffer, instr->idx[j]); } static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_buffer *cbuffer) @@ -658,11 +671,103 @@ static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, write_sm4_instruction(buffer, &instr); } +static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) +{ + const struct hlsl_profile_info *profile = ctx->profile; + const bool output = var->is_output_semantic; + D3D_NAME usage; + bool has_idx; + + struct sm4_instruction instr = + { + .dst.reg.dim = VKD3D_SM4_DIMENSION_VEC4, + .has_dst = 1, + }; + + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &instr.dst.reg.type, &has_idx)) + { + if (has_idx) + { + instr.dst.reg.idx[0] = var->semantic.index; + instr.dst.reg.idx_count = 1; + } + else + { + instr.dst.reg.idx_count = 0; + } + instr.dst.writemask = (1 << var->data_type->dimx) - 1; + } + else + { + instr.dst.reg.type = output ? VKD3D_SM4_RT_OUTPUT : VKD3D_SM4_RT_INPUT; + instr.dst.reg.idx[0] = var->reg.id; + instr.dst.reg.idx_count = 1; + instr.dst.writemask = var->reg.writemask; + } + + if (instr.dst.reg.type == VKD3D_SM4_RT_DEPTHOUT) + instr.dst.reg.dim = VKD3D_SM4_DIMENSION_SCALAR; + + hlsl_sm4_usage_from_semantic(ctx, &var->semantic, output, &usage); + + if (var->is_input_semantic) + { + switch (usage) + { + case D3D_NAME_UNDEFINED: + instr.opcode = (profile->type == VKD3D_SHADER_TYPE_PIXEL) + ? VKD3D_SM4_OP_DCL_INPUT_PS : VKD3D_SM4_OP_DCL_INPUT; + break; + + case D3D_NAME_INSTANCE_ID: + case D3D_NAME_PRIMITIVE_ID: + case D3D_NAME_VERTEX_ID: + instr.opcode = (profile->type == VKD3D_SHADER_TYPE_PIXEL) + ? VKD3D_SM4_OP_DCL_INPUT_PS_SGV : VKD3D_SM4_OP_DCL_INPUT_SGV; + break; + + default: + instr.opcode = (profile->type == VKD3D_SHADER_TYPE_PIXEL) + ? VKD3D_SM4_OP_DCL_INPUT_PS_SIV : VKD3D_SM4_OP_DCL_INPUT_SIV; + break; + } + + if (profile->type == VKD3D_SHADER_TYPE_PIXEL) + instr.opcode |= VKD3DSIM_LINEAR << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + } + else + { + if (usage == D3D_NAME_UNDEFINED || profile->type == VKD3D_SHADER_TYPE_PIXEL) + instr.opcode = VKD3D_SM4_OP_DCL_OUTPUT; + else + instr.opcode = VKD3D_SM4_OP_DCL_OUTPUT_SIV; + } + + switch (usage) + { + case D3D_NAME_COVERAGE: + case D3D_NAME_DEPTH: + case D3D_NAME_DEPTH_GREATER_EQUAL: + case D3D_NAME_DEPTH_LESS_EQUAL: + case D3D_NAME_TARGET: + case D3D_NAME_UNDEFINED: + break; + + default: + instr.idx_count = 1; + instr.idx[0] = usage; + break; + } + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; struct vkd3d_bytecode_buffer buffer = {0}; const struct hlsl_buffer *cbuffer; + const struct hlsl_ir_var *var; static const uint16_t shader_types[VKD3D_SHADER_TYPE_COUNT] = { @@ -686,6 +791,12 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) write_sm4_dcl_constant_buffer(&buffer, cbuffer); } + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if ((var->is_input_semantic && var->last_read) || (var->is_output_semantic && var->first_write)) + write_sm4_dcl_semantic(ctx, &buffer, var); + } + dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write the SM4 dcl_temps instruction.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 40ec063a264bd2e65318c54fd67ed76b0adb1060 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=40ec063a264bd2e65318c54… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:30 2021 -0500 vkd3d-shader/hlsl: Write the SM4 dcl_temps instruction. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 4 ++++ libs/vkd3d-shader/hlsl_sm4.c | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 80cea51..9b579b7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -469,6 +469,7 @@ struct hlsl_ctx struct hlsl_vec4 *values; size_t count, size; } constant_defs; + uint32_t temp_count; }; enum hlsl_error_level diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index a1d6e8e..c2aeb7b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -685,6 +685,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl struct liveness { size_t size; + uint32_t reg_count; struct { /* 0 if not live yet. */ @@ -747,6 +748,7 @@ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct liveness * ret.id = component_idx / 4; ret.writemask = writemask; ret.allocated = true; + liveness->reg_count = max(liveness->reg_count, ret.id + 1); return ret; } @@ -782,6 +784,7 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv liveness->regs[component_idx + i].last_read = last_read; ret.id = component_idx / 4; ret.allocated = true; + liveness->reg_count = max(liveness->reg_count, ret.id + align(component_count, 4)); return ret; } @@ -1008,6 +1011,7 @@ static void allocate_temp_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functio { struct liveness liveness = {0}; allocate_temp_registers_recurse(ctx, entry_func->body, &liveness); + ctx->temp_count = liveness.reg_count; } static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int *counter, bool output) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 92f854c..a66bcaa 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -762,6 +762,19 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b write_sm4_instruction(buffer, &instr); } +static void write_sm4_dcl_temps(struct vkd3d_bytecode_buffer *buffer, uint32_t temp_count) +{ + struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_DCL_TEMPS, + + .idx = {temp_count}, + .idx_count = 1, + }; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; @@ -797,6 +810,9 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) write_sm4_dcl_semantic(ctx, &buffer, var); } + if (ctx->temp_count) + write_sm4_dcl_temps(&buffer, ctx->temp_count); + dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); }

1 0