February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Use wg_parser_stream_seek() in GST_ChangeRate().
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: e103c75ab3d1f6b3a21908003b011f03e1b4862e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e103c75ab3d1f6b3a2190800… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:28 2021 -0600 winegstreamer: Use wg_parser_stream_seek() in GST_ChangeRate(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f4573c75f86..cc55b4fa60a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1178,12 +1178,11 @@ static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface) static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) { - struct parser_source *This = impl_from_IMediaSeeking(iface); - struct wg_parser_stream *stream = This->wg_stream; - GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, 0, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); - TRACE("(%p) New rate %g\n", This, This->seek.dRate); + struct parser_source *pin = impl_from_IMediaSeeking(iface); + mark_wine_thread(); - gst_pad_push_event(stream->my_sink, ev); + unix_funcs->wg_parser_stream_seek(pin->wg_stream, pin->seek.dRate, 0, 0, + AM_SEEKING_NoPositioning, AM_SEEKING_NoPositioning); return S_OK; }

1 0

Zebediah Figura : winegstreamer: Map the output sample buffer in the Unix library.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: e848a00d26c6c4c4fdfe47cac93e3d3736e6137a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e848a00d26c6c4c4fdfe47ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:29 2021 -0600 winegstreamer: Map the output sample buffer in the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 13 +++++- dlls/winegstreamer/gstdemux.c | 89 ++++++++++++++++++++----------------- dlls/winegstreamer/wg_parser.c | 94 ++++++++++++++++++++++++++++++++-------- 3 files changed, 138 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e848a00d26c6c4c4fdfe…

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm unsigned integer literals.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: vkd3d Branch: master Commit: 66694cd38570c598058106feb0b172ebf110ead4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=66694cd38570c598058106f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 12:21:11 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm unsigned integer literals. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 35e684b..8194363 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -714,6 +714,12 @@ static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%d%s", prefix, i, suffix); } +static void shader_print_uint_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, unsigned int i, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s%u%s", prefix, i, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -723,7 +729,7 @@ static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_src_param(compiler, rel_addr); vkd3d_string_buffer_printf(&compiler->buffer, " + "); } - vkd3d_string_buffer_printf(&compiler->buffer, "%u]", offset); + shader_print_uint_literal(compiler, "", offset, "]"); } static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) @@ -959,7 +965,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: case VKD3D_DATA_UINT: - shader_addline(buffer, "%u", reg->u.immconst_uint[0]); + shader_print_uint_literal(compiler, "", reg->u.immconst_uint[0], ""); break; default: shader_addline(buffer, "<unhandled data type %#x>", reg->data_type); @@ -985,9 +991,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: case VKD3D_DATA_UINT: - shader_addline(buffer, "%u, %u, %u, %u", - reg->u.immconst_uint[0], reg->u.immconst_uint[1], - reg->u.immconst_uint[2], reg->u.immconst_uint[3]); + shader_print_uint_literal(compiler, "", reg->u.immconst_uint[0], ""); + shader_print_uint_literal(compiler, ", ", reg->u.immconst_uint[1], ""); + shader_print_uint_literal(compiler, ", ", reg->u.immconst_uint[2], ""); + shader_print_uint_literal(compiler, ", ", reg->u.immconst_uint[3], ""); break; default: shader_addline(buffer, "<unhandled data type %#x>", reg->data_type); @@ -1351,7 +1358,7 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile static void shader_dump_register_space(struct vkd3d_d3d_asm_compiler *compiler, unsigned int register_space) { if (shader_ver_ge(&compiler->shader_version, 5, 1)) - vkd3d_string_buffer_printf(&compiler->buffer, ", space=%u", register_space); + shader_print_uint_literal(compiler, ", space=", register_space, ""); } static void shader_print_opcode(struct vkd3d_d3d_asm_compiler *compiler, enum vkd3d_shader_opcode opcode) @@ -1434,14 +1441,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_INDEX_RANGE: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.index_range.dst); - shader_addline(buffer, " %u", ins->declaration.index_range.register_count); + shader_print_uint_literal(compiler, " ", ins->declaration.index_range.register_count, ""); break; case VKD3DSIH_DCL_INDEXABLE_TEMP: vkd3d_string_buffer_printf(buffer, " %sx%u%s", compiler->colours.reg, ins->declaration.indexable_temp.register_idx, compiler->colours.reset); shader_print_subscript(compiler, ins->declaration.indexable_temp.register_size, NULL); - vkd3d_string_buffer_printf(buffer, ", %u", ins->declaration.indexable_temp.component_count); + shader_print_uint_literal(compiler, ", ", ins->declaration.indexable_temp.component_count, ""); break; case VKD3DSIH_DCL_INPUT_PS: @@ -1498,7 +1505,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_RESOURCE_STRUCTURED: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); - shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); break; @@ -1517,7 +1524,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: case VKD3DSIH_DCL_VERTICES_OUT: - vkd3d_string_buffer_printf(buffer, " %u", ins->declaration.count); + shader_print_uint_literal(compiler, " ", ins->declaration.count, ""); break; case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: @@ -1538,21 +1545,20 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_TGSM_RAW: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.tgsm_raw.reg); - shader_addline(buffer, ", %u", ins->declaration.tgsm_raw.byte_count); + shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_raw.byte_count, ""); break; case VKD3DSIH_DCL_TGSM_STRUCTURED: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.tgsm_structured.reg); - shader_addline(buffer, ", %u, %u", ins->declaration.tgsm_structured.byte_stride, - ins->declaration.tgsm_structured.structure_count); + shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.byte_stride, ""); + shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.structure_count, ""); break; case VKD3DSIH_DCL_THREAD_GROUP: - vkd3d_string_buffer_printf(buffer, " %u, %u, %u", - ins->declaration.thread_group_size.x, - ins->declaration.thread_group_size.y, - ins->declaration.thread_group_size.z); + shader_print_uint_literal(compiler, " ", ins->declaration.thread_group_size.x, ""); + shader_print_uint_literal(compiler, ", ", ins->declaration.thread_group_size.y, ""); + shader_print_uint_literal(compiler, ", ", ins->declaration.thread_group_size.z, ""); break; case VKD3DSIH_DCL_UAV_RAW: @@ -1566,7 +1572,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_uav_flags(compiler, ins->flags); shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); - shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); break;

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm integer literals.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: vkd3d Branch: master Commit: 03c34076e8edf9145259630a7dfae095dc3dc149 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=03c34076e8edf9145259630… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 12:21:10 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm integer literals. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b9fc34b..35e684b 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -708,6 +708,12 @@ static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%.8e%s", prefix, f, suffix); } +static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, int i, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s%d%s", prefix, i, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -948,7 +954,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); break; case VKD3D_DATA_INT: - shader_addline(buffer, "%d", reg->u.immconst_uint[0]); + shader_print_int_literal(compiler, "", reg->u.immconst_uint[0], ""); break; case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: @@ -971,9 +977,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_print_float_literal(compiler, ", ", reg->u.immconst_float[3], ""); break; case VKD3D_DATA_INT: - shader_addline(buffer, "%d, %d, %d, %d", - reg->u.immconst_uint[0], reg->u.immconst_uint[1], - reg->u.immconst_uint[2], reg->u.immconst_uint[3]); + shader_print_int_literal(compiler, "", reg->u.immconst_uint[0], ""); + shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[1], ""); + shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[2], ""); + shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[3], ""); break; case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: @@ -1574,10 +1581,12 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEFI: - vkd3d_string_buffer_printf(buffer, " %si%u%s = %d, %d, %d, %d", - compiler->colours.reg, ins->dst[0].reg.idx[0].offset, compiler->colours.reset, - ins->src[0].reg.u.immconst_uint[0], ins->src[0].reg.u.immconst_uint[1], - ins->src[0].reg.u.immconst_uint[2], ins->src[0].reg.u.immconst_uint[3]); + vkd3d_string_buffer_printf(buffer, " %si%u%s", compiler->colours.reg, + ins->dst[0].reg.idx[0].offset, compiler->colours.reset); + shader_print_int_literal(compiler, " = ", ins->src[0].reg.u.immconst_uint[0], ""); + shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[1], ""); + shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[2], ""); + shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[3], ""); break; case VKD3DSIH_DEFB: @@ -1590,8 +1599,9 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_instruction_flags(compiler, ins); if (vkd3d_shader_instruction_has_texel_offset(ins)) { - shader_addline(buffer, "(%d,%d,%d)", - ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w); + shader_print_int_literal(compiler, "(", ins->texel_offset.u, ""); + shader_print_int_literal(compiler, ",", ins->texel_offset.v, ""); + shader_print_int_literal(compiler, ",", ins->texel_offset.w, ")"); } if (ins->resource_type != VKD3D_SHADER_RESOURCE_NONE)

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm floating-point literals.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: vkd3d Branch: master Commit: 8ff88d454416cd027efc505a2b180664838b2675 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8ff88d454416cd027efc505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 12:21:09 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm floating-point literals. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b5abe22..b9fc34b 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -702,6 +702,12 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_src_param *param); +static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, float f, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s%.8e%s", prefix, f, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -939,7 +945,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_addline(buffer, "%.8e", reg->u.immconst_float[0]); + shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); break; case VKD3D_DATA_INT: shader_addline(buffer, "%d", reg->u.immconst_uint[0]); @@ -959,9 +965,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_addline(buffer, "%.8e, %.8e, %.8e, %.8e", - reg->u.immconst_float[0], reg->u.immconst_float[1], - reg->u.immconst_float[2], reg->u.immconst_float[3]); + shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_float[1], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_float[2], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_float[3], ""); break; case VKD3D_DATA_INT: shader_addline(buffer, "%d, %d, %d, %d", @@ -1401,7 +1408,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: - vkd3d_string_buffer_printf(buffer, " %.8e", ins->declaration.max_tessellation_factor); + shader_print_float_literal(compiler, " ", ins->declaration.max_tessellation_factor, ""); break; case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER: @@ -1557,11 +1564,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEF: - vkd3d_string_buffer_printf(buffer, " %sc%u%s = %.8e, %.8e, %.8e, %.8e", - compiler->colours.reg, shader_get_float_offset(ins->dst[0].reg.type, - ins->dst[0].reg.idx[0].offset), compiler->colours.reset, - ins->src[0].reg.u.immconst_float[0], ins->src[0].reg.u.immconst_float[1], - ins->src[0].reg.u.immconst_float[2], ins->src[0].reg.u.immconst_float[3]); + vkd3d_string_buffer_printf(buffer, " %sc%u%s", compiler->colours.reg, + shader_get_float_offset(ins->dst[0].reg.type, ins->dst[0].reg.idx[0].offset), + compiler->colours.reset); + shader_print_float_literal(compiler, " = ", ins->src[0].reg.u.immconst_float[0], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[1], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[2], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[3], ""); break; case VKD3DSIH_DEFI:

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm subscripts.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: vkd3d Branch: master Commit: 401b51f88800f973f12ab735cb8f8df82bc3d4f5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=401b51f88800f973f12ab73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 12:21:08 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm subscripts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 75 +++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index f8b7923..b5abe22 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -702,6 +702,18 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_src_param *param); +static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, + unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "["); + if (rel_addr) + { + shader_dump_src_param(compiler, rel_addr); + vkd3d_string_buffer_printf(&compiler->buffer, " + "); + } + vkd3d_string_buffer_printf(&compiler->buffer, "%u]", offset); +} + static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) { struct vkd3d_string_buffer *buffer = &compiler->buffer; @@ -981,51 +993,28 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { if (offset != ~0u) { - bool printbrackets = reg->idx[0].rel_addr - || reg->type == VKD3DSPR_INCONTROLPOINT - || reg->type == VKD3DSPR_IMMCONSTBUFFER - || ((compiler->shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY - || compiler->shader_version.type == VKD3D_SHADER_TYPE_HULL) - && reg->type == VKD3DSPR_INPUT); - - if (printbrackets) - shader_addline(buffer, "%s[", compiler->colours.reset); - if (reg->idx[0].rel_addr) + if (reg->idx[0].rel_addr || reg->type == VKD3DSPR_IMMCONSTBUFFER + || reg->type == VKD3DSPR_INCONTROLPOINT || (reg->type == VKD3DSPR_INPUT + && (compiler->shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY + || compiler->shader_version.type == VKD3D_SHADER_TYPE_HULL))) { - shader_dump_src_param(compiler, reg->idx[0].rel_addr); - shader_addline(buffer, " + "); + vkd3d_string_buffer_printf(buffer, "%s", compiler->colours.reset); + shader_print_subscript(compiler, offset, reg->idx[0].rel_addr); } - shader_addline(buffer, "%u", offset); - if (printbrackets) - shader_addline(buffer, "]"); else - shader_addline(buffer, "%s", compiler->colours.reset); + { + vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset); + } /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] * to normalise it with 5.1. * Here we should ignore it if it's a CB in sm < 5.1. */ if (reg->idx[1].offset != ~0u && (reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1))) - { - shader_addline(buffer, "["); - if (reg->idx[1].rel_addr) - { - shader_dump_src_param(compiler, reg->idx[1].rel_addr); - shader_addline(buffer, " + "); - } - shader_addline(buffer, "%u]", reg->idx[1].offset); - } + shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); if (reg->idx[2].offset != ~0u) - { - shader_addline(buffer, "["); - if (reg->idx[2].rel_addr) - { - shader_dump_src_param(compiler, reg->idx[2].rel_addr); - shader_addline(buffer, " + "); - } - shader_addline(buffer, "%u]", reg->idx[2].offset); - } + shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr); } else { @@ -1033,7 +1022,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const } if (reg->type == VKD3DSPR_FUNCTIONPOINTER) - shader_addline(buffer, "[%u]", reg->u.fp_body_idx); + shader_print_subscript(compiler, reg->u.fp_body_idx, NULL); } else { @@ -1392,7 +1381,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(buffer, " "); shader_dump_register(compiler, &ins->declaration.cb.src.reg); if (shader_ver_ge(&compiler->shader_version, 5, 1)) - shader_addline(buffer, "[%u]", ins->declaration.cb.size); + shader_print_subscript(compiler, ins->declaration.cb.size, NULL); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); shader_dump_register_space(compiler, ins->declaration.cb.register_space); @@ -1435,10 +1424,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_INDEXABLE_TEMP: - vkd3d_string_buffer_printf(buffer, " %sx%u%s[%u], %u", compiler->colours.reg, - ins->declaration.indexable_temp.register_idx, compiler->colours.reset, - ins->declaration.indexable_temp.register_size, - ins->declaration.indexable_temp.component_count); + vkd3d_string_buffer_printf(buffer, " %sx%u%s", compiler->colours.reg, + ins->declaration.indexable_temp.register_idx, compiler->colours.reset); + shader_print_subscript(compiler, ins->declaration.indexable_temp.register_size, NULL); + vkd3d_string_buffer_printf(buffer, ", %u", ins->declaration.indexable_temp.component_count); break; case VKD3DSIH_DCL_INPUT_PS: @@ -1480,8 +1469,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_INTERFACE: - vkd3d_string_buffer_printf(buffer, " fp%u[%u][%u] = {...}", ins->declaration.fp.index, - ins->declaration.fp.array_size, ins->declaration.fp.body_count); + vkd3d_string_buffer_printf(buffer, " fp%u", ins->declaration.fp.index); + shader_print_subscript(compiler, ins->declaration.fp.array_size, NULL); + shader_print_subscript(compiler, ins->declaration.fp.body_count, NULL); + vkd3d_string_buffer_printf(buffer, " = {...}"); break; case VKD3DSIH_DCL_RESOURCE_RAW:

1 0

Henri Verbeet : vkd3d-shader: Add some colour to d3d-asm register names.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: vkd3d Branch: master Commit: be024a7e1720bb721f624df5aac4cc4e1bec1327 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be024a7e1720bb721f624df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 12:21:07 2021 +0100 vkd3d-shader: Add some colour to d3d-asm register names. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fb5370a..f8b7923 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -304,6 +304,7 @@ struct vkd3d_d3d_asm_colours { const char *reset; const char *opcode; + const char *reg; }; struct vkd3d_d3d_asm_compiler @@ -709,6 +710,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; + shader_addline(buffer, "%s", compiler->colours.reg); switch (reg->type) { case VKD3DSPR_TEMP: @@ -918,7 +920,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const if (reg->type == VKD3DSPR_IMMCONST) { - shader_addline(buffer, "("); + shader_addline(buffer, "%s(", compiler->colours.reset); switch (reg->immconst_type) { case VKD3D_IMMCONST_SCALAR: @@ -987,7 +989,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const && reg->type == VKD3DSPR_INPUT); if (printbrackets) - shader_addline(buffer, "["); + shader_addline(buffer, "%s[", compiler->colours.reset); if (reg->idx[0].rel_addr) { shader_dump_src_param(compiler, reg->idx[0].rel_addr); @@ -996,6 +998,8 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "%u", offset); if (printbrackets) shader_addline(buffer, "]"); + else + shader_addline(buffer, "%s", compiler->colours.reset); /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] * to normalise it with 5.1. @@ -1023,10 +1027,18 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "%u]", reg->idx[2].offset); } } + else + { + shader_addline(buffer, "%s", compiler->colours.reset); + } if (reg->type == VKD3DSPR_FUNCTIONPOINTER) shader_addline(buffer, "[%u]", reg->u.fp_body_idx); } + else + { + shader_addline(buffer, "%s", compiler->colours.reset); + } } static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, @@ -1423,8 +1435,8 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_INDEXABLE_TEMP: - vkd3d_string_buffer_printf(buffer, " x%u[%u], %u", - ins->declaration.indexable_temp.register_idx, + vkd3d_string_buffer_printf(buffer, " %sx%u%s[%u], %u", compiler->colours.reg, + ins->declaration.indexable_temp.register_idx, compiler->colours.reset, ins->declaration.indexable_temp.register_size, ins->declaration.indexable_temp.component_count); break; @@ -1554,20 +1566,23 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEF: - vkd3d_string_buffer_printf(buffer, " c%u = %.8e, %.8e, %.8e, %.8e", - shader_get_float_offset(ins->dst[0].reg.type, ins->dst[0].reg.idx[0].offset), + vkd3d_string_buffer_printf(buffer, " %sc%u%s = %.8e, %.8e, %.8e, %.8e", + compiler->colours.reg, shader_get_float_offset(ins->dst[0].reg.type, + ins->dst[0].reg.idx[0].offset), compiler->colours.reset, ins->src[0].reg.u.immconst_float[0], ins->src[0].reg.u.immconst_float[1], ins->src[0].reg.u.immconst_float[2], ins->src[0].reg.u.immconst_float[3]); break; case VKD3DSIH_DEFI: - vkd3d_string_buffer_printf(buffer, " i%u = %d, %d, %d, %d", ins->dst[0].reg.idx[0].offset, + vkd3d_string_buffer_printf(buffer, " %si%u%s = %d, %d, %d, %d", + compiler->colours.reg, ins->dst[0].reg.idx[0].offset, compiler->colours.reset, ins->src[0].reg.u.immconst_uint[0], ins->src[0].reg.u.immconst_uint[1], ins->src[0].reg.u.immconst_uint[2], ins->src[0].reg.u.immconst_uint[3]); break; case VKD3DSIH_DEFB: - vkd3d_string_buffer_printf(buffer, " b%u = %s", ins->dst[0].reg.idx[0].offset, + vkd3d_string_buffer_printf(buffer, " %sb%u%s = %s", compiler->colours.reg, + ins->dst[0].reg.idx[0].offset, compiler->colours.reset, ins->src[0].reg.u.immconst_uint[0] ? "true" : "false"); break; @@ -1627,11 +1642,13 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, { .reset = "", .opcode = "", + .reg = "", }; static const struct vkd3d_d3d_asm_colours colours = { .reset = "\x1b[m", .opcode = "\x1b[96;1m", + .reg = "\x1b[96m", }; formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT

1 0

Alexandre Julliard : kernelbase: Don't use wine/server.h.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 4dacf60a6a31aac8b04c8696b75c9b30fdf471d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dacf60a6a31aac8b04c8696… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:43:27 2021 +0100 kernelbase: Don't use wine/server.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/sync.c | 1 - dlls/kernelbase/volume.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index f4bee2d134b..ab963c62221 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -37,7 +37,6 @@ #include "kernelbase.h" #include "wine/asm.h" #include "wine/exception.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sync); diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 7daf9c98823..a0d1bb705b3 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -38,7 +38,6 @@ #include "ddk/mountmgr.h" #include "ddk/wdm.h" #include "kernelbase.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(volume);

1 0

Alexandre Julliard : krnl386.exe: Don't use wine/server.h.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 4a17ca008ec01029cc6d3ab6ac8a2ca037203beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a17ca008ec01029cc6d3ab6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:43:48 2021 +0100 krnl386.exe: Don't use wine/server.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/int21.c | 1 - dlls/krnl386.exe16/selector.c | 1 - dlls/krnl386.exe16/vxd.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 24909eadddc..5129fbd8eb6 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -37,7 +37,6 @@ #include "dosexe.h" #include "winerror.h" #include "winuser.h" -#include "wine/server.h" #include "wine/debug.h" #include "wine/exception.h" diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 26c86f06a9f..ab5881c8927 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -21,7 +21,6 @@ #include <string.h> #include "wine/winbase16.h" -#include "wine/server.h" #include "wine/debug.h" #include "kernel16_private.h" diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index c259cd60775..5d280fb2fda 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -35,7 +35,6 @@ #include "winioctl.h" #include "kernel16_private.h" #include "dosexe.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(vxd);

1 0

Jacek Caban : conhost: Avoid assumption about the exact Unix cursor position after writing to the last column.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 9e97f3513eeea8da96654e9843579461649c3597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e97f3513eeea8da96654e98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 16 20:32:33 2021 +0100 conhost: Avoid assumption about the exact Unix cursor position after writing to the last column. Spotted by Roman Pišl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50581 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dd22636be6a..fbee37d9c01 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -195,6 +195,14 @@ static void set_tty_cursor( struct console *console, unsigned int x, unsigned in else if (!x && y == console->tty_cursor_y) strcpy( buf, "\r" ); else if (y == console->tty_cursor_y) { + if (console->is_unix && console->tty_cursor_x >= console->active->width) + { + /* Unix will usually have the cursor at width-1 in this case. instead of depending + * on the exact behaviour, move the cursor to the first column and move forward + * from threre. */ + tty_write( console, "\r", 1 ); + console->tty_cursor_x = 0; + } if (x + 1 == console->tty_cursor_x) strcpy( buf, "\b" ); else if (x > console->tty_cursor_x) sprintf( buf, "\x1b[%uC", x - console->tty_cursor_x ); else sprintf( buf, "\x1b[%uD", console->tty_cursor_x - x );

1 0