wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Zebediah Figura : winegstreamer: Manually track read offsets in the media source.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 38330678a0e92db67ccf8ba4329e4449c2fa0681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38330678a0e92db67ccf8ba4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:23 2021 -0600 winegstreamer: Manually track read offsets in the media source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a9a85cf4d4b..ffbf8041ed8 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -111,6 +111,8 @@ struct media_source SOURCE_SHUTDOWN, } state; HANDLE no_more_pads_event; + + uint64_t file_size, next_pull_offset; }; static inline struct media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface) @@ -449,11 +451,12 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of TRACE("requesting %u bytes at %s from source %p into buffer %p\n", len, wine_dbgstr_longlong(ofs), source, *buf); - if (ofs != GST_BUFFER_OFFSET_NONE) - { - if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) - return GST_FLOW_ERROR; - } + if (ofs == GST_BUFFER_OFFSET_NONE) + ofs = source->next_pull_offset; + source->next_pull_offset = ofs + len; + + if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) + return GST_FLOW_ERROR; if (FAILED(IMFByteStream_IsEndOfStream(byte_stream, &is_eof))) return GST_FLOW_ERROR; @@ -1244,6 +1247,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object; gint64 total_pres_time = 0; DWORD bytestream_caps; + uint64_t file_size; unsigned int i; HRESULT hr; int ret; @@ -1257,6 +1261,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return MF_E_BYTESTREAM_NOT_SEEKABLE; } + if (FAILED(hr = IMFByteStream_GetLength(bytestream, &file_size))) + { + FIXME("Failed to get byte stream length, hr %#x.\n", hr); + return hr; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1266,6 +1276,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ object->byte_stream = bytestream; IMFByteStream_AddRef(bytestream); object->no_more_pads_event = CreateEventA(NULL, FALSE, FALSE, NULL); + object->file_size = file_size; if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail;

1 0

Henri Verbeet : vkd3d-shader: Recognise the "raw_buffer" and "structured_buffer" shader model 5 resource types.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: 804d191aee092165b19acbfa7e750b7fec83083d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=804d191aee092165b19acbf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 15:57:12 2021 +0100 vkd3d-shader: Recognise the "raw_buffer" and "structured_buffer" shader model 5 resource types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 11 +++++++++++ libs/vkd3d-shader/trace.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e88e5a1..bfc3cce 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -442,6 +442,8 @@ enum vkd3d_sm4_resource_type VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY = 0x8, VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY = 0x9, VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY = 0xa, + VKD3D_SM4_RESOURCE_RAW_BUFFER = 0xb, + VKD3D_SM4_RESOURCE_STRUCTURED_BUFFER = 0xc, }; enum vkd3d_sm4_data_type @@ -535,6 +537,8 @@ static const enum vkd3d_shader_resource_type resource_type_table[] = /* VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY */ VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY, /* VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY */ VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, /* VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY */ VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, + /* VKD3D_SM4_RESOURCE_RAW_BUFFER */ VKD3D_SHADER_RESOURCE_BUFFER, + /* VKD3D_SM4_RESOURCE_STRUCTURED_BUFFER */ VKD3D_SHADER_RESOURCE_BUFFER, }; static const enum vkd3d_data_type data_type_table[] = @@ -1831,6 +1835,11 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh enum vkd3d_sm4_resource_type resource_type = (modifier & VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; + if (resource_type == VKD3D_SM4_RESOURCE_RAW_BUFFER) + ins->raw = true; + else if (resource_type == VKD3D_SM4_RESOURCE_STRUCTURED_BUFFER) + ins->structured = true; + if (resource_type < ARRAY_SIZE(resource_type_table)) ins->resource_type = resource_type_table[resource_type]; else @@ -1899,6 +1908,8 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha ins->handler_idx = opcode_info->handler_idx; ins->flags = 0; ins->coissue = false; + ins->raw = false; + ins->structured = false; ins->predicate = NULL; ins->dst_count = strlen(opcode_info->dst_info); ins->dst = priv->dst_param; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 52040ae..4e35511 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1639,6 +1639,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, if (ins->resource_type != VKD3D_SHADER_RESOURCE_NONE) { shader_addline(buffer, "_indexable("); + if (ins->raw) + vkd3d_string_buffer_printf(buffer, "raw_"); + if (ins->structured) + vkd3d_string_buffer_printf(buffer, "structured_"); shader_dump_resource_type(compiler, ins->resource_type); if (ins->resource_stride) shader_print_uint_literal(compiler, ", stride=", ins->resource_stride, ""); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d49b47d..6101c38 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -789,7 +789,7 @@ struct vkd3d_shader_instruction enum vkd3d_shader_resource_type resource_type; unsigned int resource_stride; enum vkd3d_data_type resource_data_type[VKD3D_VEC4_SIZE]; - bool coissue; + bool coissue, structured, raw; const struct vkd3d_shader_src_param *predicate; union {

1 0

Henri Verbeet : vkd3d-shader: Parse shader model 5 resource strides.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: 3bacb33556052d23ffe77b66e14c268c008eb060 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bacb33556052d23ffe77b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 15:57:11 2021 +0100 vkd3d-shader: Parse shader model 5 resource strides. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 7 +++++++ libs/vkd3d-shader/trace.c | 17 ++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6d32b1d..e88e5a1 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -29,6 +29,9 @@ #define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 #define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) +#define VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_SHIFT 11 +#define VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_MASK (0xfffu << VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_SHIFT) + #define VKD3D_SM4_AOFFIMMI_U_SHIFT 9 #define VKD3D_SM4_AOFFIMMI_U_MASK (0xfu << VKD3D_SM4_AOFFIMMI_U_SHIFT) #define VKD3D_SM4_AOFFIMMI_V_SHIFT 13 @@ -1835,6 +1838,9 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh FIXME("Unhandled resource type %#x.\n", resource_type); ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; } + + ins->resource_stride + = (modifier & VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_MASK) >> VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_SHIFT; break; } @@ -1899,6 +1905,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; + ins->resource_stride = 0; ins->resource_data_type[0] = VKD3D_DATA_FLOAT; ins->resource_data_type[1] = VKD3D_DATA_FLOAT; ins->resource_data_type[2] = VKD3D_DATA_FLOAT; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 6e1b3a0..52040ae 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1635,20 +1635,23 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, default: shader_dump_instruction_flags(compiler, ins); - if (vkd3d_shader_instruction_has_texel_offset(ins)) - { - 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) { - shader_addline(buffer, "("); + shader_addline(buffer, "_indexable("); shader_dump_resource_type(compiler, ins->resource_type); + if (ins->resource_stride) + shader_print_uint_literal(compiler, ", stride=", ins->resource_stride, ""); shader_addline(buffer, ")"); } + if (vkd3d_shader_instruction_has_texel_offset(ins)) + { + 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_data_type[0] != VKD3D_DATA_FLOAT || ins->resource_data_type[1] != VKD3D_DATA_FLOAT || ins->resource_data_type[2] != VKD3D_DATA_FLOAT diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e9e10ba..d49b47d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -787,6 +787,7 @@ struct vkd3d_shader_instruction const struct vkd3d_shader_src_param *src; struct vkd3d_shader_texel_offset texel_offset; enum vkd3d_shader_resource_type resource_type; + unsigned int resource_stride; enum vkd3d_data_type resource_data_type[VKD3D_VEC4_SIZE]; bool coissue; const struct vkd3d_shader_src_param *predicate;

1 0

Henri Verbeet : vkd3d-shader: Explicitly handle "none" modifiers in shader_sm4_read_param().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: d40d8c858edb6f978ad0c718055cb11da1093236 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d40d8c858edb6f978ad0c71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 15:57:10 2021 +0100 vkd3d-shader: Explicitly handle "none" modifiers in shader_sm4_read_param(). These (seemingly) have no effect, it's not entirely clear why they are generated. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5b56259..6d32b1d 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -357,6 +357,14 @@ enum vkd3d_sm4_register_type VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, }; +enum vkd3d_sm4_register_modifier +{ + VKD3D_SM4_REGISTER_MODIFIER_NONE = 0x01, + VKD3D_SM4_REGISTER_MODIFIER_NEGATE = 0x41, + VKD3D_SM4_REGISTER_MODIFIER_ABS = 0x81, + VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE = 0xc1, +}; + enum vkd3d_sm4_output_primitive_type { VKD3D_SM4_OUTPUT_PT_POINTLIST = 0x1, @@ -1522,20 +1530,21 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr switch (m) { - case 0x41: + case VKD3D_SM4_REGISTER_MODIFIER_NEGATE: *modifier = VKD3DSPSM_NEG; break; - case 0x81: + case VKD3D_SM4_REGISTER_MODIFIER_ABS: *modifier = VKD3DSPSM_ABS; break; - case 0xc1: + case VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE: *modifier = VKD3DSPSM_ABSNEG; break; default: FIXME("Skipping modifier 0x%08x.\n", m); + case VKD3D_SM4_REGISTER_MODIFIER_NONE: *modifier = VKD3DSPSM_NONE; break; }

1 0

Henri Verbeet : vkd3d-shader: Do not print FIXMEs for VKD3DSUF_ORDER_PRESERVING_COUNTER when generating SPIR-V.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: 944665ed11650a72e36b40a2da0cd400cf76b375 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=944665ed11650a72e36b40a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 15:57:09 2021 +0100 vkd3d-shader: Do not print FIXMEs for VKD3DSUF_ORDER_PRESERVING_COUNTER when generating SPIR-V. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b0b2399..1448d3b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5644,9 +5644,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + uint32_t flags = instruction->flags; - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); + /* We don't distinguish between APPEND and COUNTER UAVs. */ + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + if (flags) + FIXME("Unhandled UAV flags %#x.\n", flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->resource, semantic->resource_type, semantic->resource_data_type[0], 0, false); @@ -5656,9 +5659,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; + uint32_t flags = instruction->flags; - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); + /* We don't distinguish between APPEND and COUNTER UAVs. */ + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + if (flags) + FIXME("Unhandled UAV flags %#x.\n", flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); @@ -5669,9 +5675,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c { const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; unsigned int stride = resource->byte_stride; + uint32_t flags = instruction->flags; - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); + /* We don't distinguish between APPEND and COUNTER UAVs. */ + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + if (flags) + FIXME("Unhandled UAV flags %#x.\n", flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false);

1 0

Henri Verbeet : vkd3d-shader: Respect VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT for d3d-asm output.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: 7a791f5ef9d3eeedbf55f3b4d597af1e5a181551 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7a791f5ef9d3eeedbf55f3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 15:57:08 2021 +0100 vkd3d-shader: Respect VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT for d3d-asm output. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index afc81d3..6e1b3a0 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1682,8 +1682,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_d3d_asm_compiler compiler; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; + unsigned int indent, i; + const char *indent_str; const DWORD *ptr; - unsigned int i; void *code; static const struct vkd3d_d3d_asm_colours no_colours = @@ -1724,6 +1725,10 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, compiler.colours = colours; else compiler.colours = no_colours; + if (formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT) + indent_str = " "; + else + indent_str = ""; buffer = &compiler.buffer; vkd3d_string_buffer_init(buffer); @@ -1734,6 +1739,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); + indent = 0; while (!shader_sm4_is_end(data, &ptr)) { struct vkd3d_shader_instruction ins; @@ -1747,7 +1753,38 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, continue; } + switch (ins.handler_idx) + { + case VKD3DSIH_ELSE: + case VKD3DSIH_ENDIF: + case VKD3DSIH_ENDLOOP: + case VKD3DSIH_ENDSWITCH: + --indent; + break; + + default: + break; + } + + for (i = 0; i < indent; ++i) + { + vkd3d_string_buffer_printf(buffer, "%s", indent_str); + } + shader_dump_instruction(&compiler, &ins); + + switch (ins.handler_idx) + { + case VKD3DSIH_ELSE: + case VKD3DSIH_IF: + case VKD3DSIH_LOOP: + case VKD3DSIH_SWITCH: + ++indent; + break; + + default: + break; + } } if ((code = vkd3d_malloc(buffer->content_size)))

1 0

Henri Verbeet : vkd3d-shader: Add some colour to the d3d-asm version token.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: f0dee5a06a6e6bf7a931578d80b6c6ab91c7e521 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0dee5a06a6e6bf7a931578… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 15:57:07 2021 +0100 vkd3d-shader: Add some colour to the d3d-asm version token. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 742fbce..afc81d3 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -308,6 +308,7 @@ struct vkd3d_d3d_asm_colours const char *opcode; const char *reg; const char *swizzle; + const char *version; const char *write_mask; }; @@ -1692,6 +1693,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .opcode = "", .reg = "", .swizzle = "", + .version = "", .write_mask = "", }; static const struct vkd3d_d3d_asm_colours colours = @@ -1701,6 +1703,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .opcode = "\x1b[96;1m", .reg = "\x1b[96m", .swizzle = "\x1b[93m", + .version = "\x1b[36m", .write_mask = "\x1b[93m", }; @@ -1727,8 +1730,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, shader_version = &compiler.shader_version; shader_sm4_read_header(data, &ptr, shader_version); - vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u\n", compiler.colours.reset, - shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor); + vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, + shader_get_type_prefix(shader_version->type), shader_version->major, + shader_version->minor, compiler.colours.reset); while (!shader_sm4_is_end(data, &ptr)) {

1 0

Zebediah Figura : vkd3d-shader: Avoid using debug functions for shader error messages.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: 7afe9148f05c5f5c331583e8595860c1ff42814f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7afe9148f05c5f5c331583e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 16 23:52:06 2021 -0600 vkd3d-shader: Avoid using debug functions for shader error messages. 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.y | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a3d4b4e..c33d97c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1711,17 +1711,15 @@ hlsl_prog: if (decl->body && $2.decl->body) { hlsl_error(ctx, $2.decl->loc, - "redefinition of function %s", debugstr_a($2.name)); + "redefinition of function \"%s\"", $2.name); YYABORT; } else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type)) { hlsl_error(ctx, $2.decl->loc, - "redefining function %s with a different return type", - debugstr_a($2.name)); + "redefining function \"%s\" with a different return type", $2.name); hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, - "%s previously declared here", - debugstr_a($2.name)); + "\"%s\" previously declared here", $2.name); YYABORT; } } @@ -2570,7 +2568,7 @@ postfix_expr: } if (!$$) { - hlsl_error(ctx, @3, "invalid subscript %s", debugstr_a($3)); + hlsl_error(ctx, @3, "invalid subscript \"%s\"", $3); YYABORT; } } @@ -2580,14 +2578,14 @@ postfix_expr: if (!(swizzle = get_swizzle(ctx, node, $3, &@3))) { - hlsl_error(ctx, @3, "invalid swizzle %s", debugstr_a($3)); + hlsl_error(ctx, @3, "invalid swizzle \"%s\"", $3); YYABORT; } $$ = append_unop($1, &swizzle->node); } else { - hlsl_error(ctx, @3, "invalid subscript %s", debugstr_a($3)); + hlsl_error(ctx, @3, "invalid subscript \"%s\"", $3); YYABORT; } } @@ -3098,7 +3096,7 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) if (!(entry_func = get_func_entry(ctx, entrypoint))) { - hlsl_message("error: entry point %s is not defined\n", debugstr_a(entrypoint)); + hlsl_message("error: entry point \"%s\" is not defined\n", entrypoint); return VKD3D_ERROR_INVALID_SHADER; }

1 0

Zebediah Figura : vkd3d-shader: Get rid of hlsl_base_type_to_string().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: 124069907de407e77c283760b4a7950398e542a3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=124069907de407e77c28376… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 16 23:52:05 2021 -0600 vkd3d-shader: Get rid of hlsl_base_type_to_string(). 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.c | 47 ++++++++++++++--------------------------------- libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 3 ++- 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 342fe6a..9e1eb7e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -639,55 +639,37 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr return 0; } -const char *hlsl_base_type_to_string(const struct hlsl_type *type) -{ - const char *name = "(unknown)"; - - switch (type->base_type) - { - case HLSL_TYPE_FLOAT: name = "float"; break; - case HLSL_TYPE_HALF: name = "half"; break; - case HLSL_TYPE_DOUBLE: name = "double"; break; - case HLSL_TYPE_INT: name = "int"; break; - case HLSL_TYPE_UINT: name = "uint"; break; - case HLSL_TYPE_BOOL: name = "bool"; break; - case HLSL_TYPE_SAMPLER: - switch (type->sampler_dim) - { - case HLSL_SAMPLER_DIM_GENERIC: name = "sampler"; break; - case HLSL_SAMPLER_DIM_1D: name = "sampler1D"; break; - case HLSL_SAMPLER_DIM_2D: name = "sampler2D"; break; - case HLSL_SAMPLER_DIM_3D: name = "sampler3D"; break; - case HLSL_SAMPLER_DIM_CUBE: name = "samplerCUBE"; break; - } - break; - default: - FIXME("Unhandled case %u.\n", type->base_type); - } - return name; -} - char *hlsl_type_to_string(const struct hlsl_type *type) { const char *name; char *string; + static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = + { + "float", + "half", + "double", + "int", + "uint", + "bool", + }; + if (type->name) return vkd3d_strdup(type->name); switch (type->type) { case HLSL_CLASS_SCALAR: - return vkd3d_strdup(hlsl_base_type_to_string(type)); + return vkd3d_strdup(base_types[type->base_type]); case HLSL_CLASS_VECTOR: - name = hlsl_base_type_to_string(type); + name = base_types[type->base_type]; if ((string = malloc(strlen(name) + 2))) sprintf(string, "%s%u", name, type->dimx); return string; case HLSL_CLASS_MATRIX: - name = hlsl_base_type_to_string(type); + name = base_types[type->base_type]; if ((string = malloc(strlen(name) + 4))) sprintf(string, "%s%ux%u", name, type->dimx, type->dimy); return string; @@ -907,8 +889,7 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl break; default: - vkd3d_string_buffer_printf(buffer, "Constants of type %s not supported\n", - hlsl_base_type_to_string(type)); + assert(0); } } if (type->dimx != 1) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b2b7daf..56b8e2a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -496,7 +496,6 @@ static inline void hlsl_src_remove(struct hlsl_src *src) const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; -const char *hlsl_base_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; char *hlsl_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; char *hlsl_modifiers_to_string(unsigned int modifiers) DECLSPEC_HIDDEN; const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8b91ff5..a3d4b4e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -909,13 +909,14 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) case HLSL_TYPE_INT: return constant->value.i[0]; case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: return constant->value.f[0]; case HLSL_TYPE_DOUBLE: return constant->value.d[0]; case HLSL_TYPE_BOOL: return constant->value.b[0]; default: - WARN("Invalid type %s.\n", hlsl_base_type_to_string(constant->node.data_type)); + assert(0); return 0; } }

1 0

Zebediah Figura : vkd3d-shader: Correctly dump array types.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: vkd3d Branch: master Commit: 60f7735b202ffc9c5a188db7d53b8c659ad0ea5a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=60f7735b202ffc9c5a188db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 16 23:52:04 2021 -0600 vkd3d-shader: Correctly dump array types. 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.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f181439..342fe6a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -693,10 +693,27 @@ char *hlsl_type_to_string(const struct hlsl_type *type) return string; case HLSL_CLASS_ARRAY: - name = hlsl_base_type_to_string(type->e.array.type); - if ((string = malloc(strlen(name) + 15))) - sprintf(string, "%s[%u]", name, type->e.array.elements_count); + { + const struct hlsl_type *t; + char *inner_string; + size_t len = 1; + + for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) + len += 14; + if (!(inner_string = hlsl_type_to_string(t))) + return NULL; + len += strlen(inner_string); + + if ((string = malloc(len))) + { + strcpy(string, inner_string); + for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) + sprintf(string + strlen(string), "[%u]", t->e.array.elements_count); + } + + vkd3d_free(inner_string); return string; + } case HLSL_CLASS_STRUCT: return vkd3d_strdup("<anonymous struct>");

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021