September 2020 - Wine-commits

Nikolay Sivov : mf/session: Add support for MR_VIDEO_RENDER_SERVICE service.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 2ff7160cb7fc2f566237e0cb755d4b76a6882d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff7160cb7fc2f566237e0cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:37 2020 +0300 mf/session: Add support for MR_VIDEO_RENDER_SERVICE service. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e2a6b868ca..a1b54b7080 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "mfidl.h" +#include "evr.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1794,6 +1795,57 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } + else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + IMFStreamSink *stream_sink; + IMFTopologyNode *node; + IUnknown *vr, *object; + IMFCollection *nodes; + IMFMediaSink *sink; + unsigned int i = 0; + HRESULT hr; + + EnterCriticalSection(&session->cs); + + /* Use first sink to support IMFVideoRenderer. */ + if (session->presentation.current_topology) + { + if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, + &nodes))) + { + while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) + { + if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + { + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + { + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + { + if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) + { + if (FAILED(hr = MFGetService(vr, service, riid, obj))) + WARN("Failed to get service from video renderer %#x.\n", hr); + IUnknown_Release(vr); + } + } + IMFStreamSink_Release(stream_sink); + } + + IUnknown_Release(object); + } + + IMFTopologyNode_Release(node); + + if (*obj) + break; + } + + IMFCollection_Release(nodes); + } + } + + LeaveCriticalSection(&session->cs); + } else FIXME("Unsupported service %s.\n", debugstr_guid(service));

1 0

Zebediah Figura : qcap/avimux: Pass the correct field to CONTAINING_RECORD in impl_sink_from_strmbase_pin().
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: e8bb3dbb7bcf22b9dcb7a136ad8b6b2c5f70b99d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8bb3dbb7bcf22b9dcb7a136… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 4 17:21:41 2020 -0500 qcap/avimux: Pass the correct field to CONTAINING_RECORD in impl_sink_from_strmbase_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index ea73e42040..3f4d0f2cd6 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1257,7 +1257,7 @@ static const IQualityControlVtbl AviMuxOut_QualityControlVtbl = { static inline AviMuxIn *impl_sink_from_strmbase_pin(struct strmbase_pin *iface) { - return CONTAINING_RECORD(iface, AviMuxIn, pin.pin.IPin_iface); + return CONTAINING_RECORD(iface, AviMuxIn, pin.pin); } static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out)

1 0

Esme Povirk : mscoree: Use exe basename to name the default domain.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: f222f564143db472d0a35524a40e04ecff59737a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f222f564143db472d0a35524… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Sep 6 10:29:21 2020 -0500 mscoree: Use exe basename to name the default domain. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index e854ec2bdf..a3ed153475 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -298,6 +298,21 @@ fail: return E_FAIL; } +static char* get_exe_basename_utf8(void) +{ + WCHAR filenameW[MAX_PATH], *basenameW; + + GetModuleFileNameW(NULL, filenameW, MAX_PATH); + + basenameW = wcsrchr(filenameW, '\\'); + if (basenameW) + basenameW += 1; + else + basenameW = filenameW; + + return WtoA(basenameW); +} + MonoDomain* get_root_domain(void) { static MonoDomain* root_domain; @@ -309,8 +324,13 @@ MonoDomain* get_root_domain(void) if (root_domain == NULL) { - /* FIXME: Use exe filename to name the domain? */ - root_domain = mono_jit_init_version("mscorlib.dll", "v4.0.30319"); + char *exe_basename; + + exe_basename = get_exe_basename_utf8(); + + root_domain = mono_jit_init_version(exe_basename, "v4.0.30319"); + + HeapFree(GetProcessHeap(), 0, exe_basename); is_mono_started = TRUE; }

1 0

Rémi Bernon : widl: Search for known types in current namespace.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: f4f612a07713bac6969b389f44378e4f7ceef587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4f612a07713bac6969b389f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 3 14:41:59 2020 +0200 widl: Search for known types in current namespace. Fixes the following error with this sample idl: #ifdef __WIDL__ #pragma winrt ns_prefix #endif import "wtypes.idl"; namespace Windows { [object] interface IFoo {} [object] interface IBar { HRESULT DoBar([in] IFoo *foo); } } $ widl -o windows.foo.h windows.foo.idl windows.foo.idl:13: error: type 'IFoo' not found Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3ef8d89ba1..91c5b809bb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1959,7 +1959,7 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) static type_t *find_type_or_error(const char *name, int t) { - type_t *type = find_type(name, NULL, t); + type_t *type = find_type(name, current_namespace, t); if (!type) { error_loc("type '%s' not found\n", name); return NULL;

1 0

Isabella Bosia : vkd3d-compiler: Add spirv-text output type.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: c7f73f10fa4dc6b247ea0ad12cb9e41c6362553e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7f73f10fa4dc6b247ea0ad… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:46 2020 +0100 vkd3d-compiler: Add spirv-text output type. Also allow outputting non-binary formats to tty. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index cb23b81..c05ec6a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -51,8 +51,8 @@ static const struct source_type_info source_type_info[] = { {VKD3D_SHADER_SOURCE_DXBC_TPF, - "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" - " This is the format used for Direct3D shader model 4 and 5 shaders."}, + "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" + " This is the format used for Direct3D shader model 4 and 5 shaders.\n"}, }; static const struct target_type_info @@ -60,12 +60,17 @@ static const struct target_type_info enum vkd3d_shader_target_type type; const char *name; const char *description; + bool is_binary; } target_type_info[] = { {VKD3D_SHADER_TARGET_SPIRV_BINARY, "spirv-binary", "A SPIR-V shader in binary form.\n" - " This is the format used for Vulkan shaders.\n"}, + " This is the format used for Vulkan shaders.\n", + true}, + {VKD3D_SHADER_TARGET_SPIRV_TEXT, + "spirv-text", "A SPIR-V shader in text form.\n", + false}, }; static bool read_shader(struct vkd3d_shader_code *shader, FILE *f) @@ -134,8 +139,7 @@ static void print_usage(const char *program_name) "[options...] [file]\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -b <type> Specify the target type. Currently the only valid value\n" - " is 'spirv-binary'.\n" + " -b <type> Specify the target type.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" @@ -393,7 +397,7 @@ static void print_source_types(void) { const struct source_type_info *type = get_source_type_info(source_types[i]); if (type) - fprintf(stdout, " %s %s", type->name, type->description); + fprintf(stdout, " %-12s %s", type->name, type->description); } } @@ -410,7 +414,7 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) { const struct target_type_info *type = get_target_type_info(target_types[i]); if (type) - fprintf(stdout, " %s %s", type->name, type->description); + fprintf(stdout, " %-12s %s", type->name, type->description); } } @@ -502,7 +506,8 @@ int main(int argc, char **argv) if (!(output = open_output(options.output_filename, &close_output))) goto done; - if (!options.output_filename && isatty(fileno(output))) + if (!options.output_filename && get_target_type_info(options.target_type)->is_binary + && isatty(fileno(output))) { fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" "If this is really what you intended, specify the output explicitly.\n");

1 0

Isabella Bosia : vkd3d-compiler: Add formatting options.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: 04069d8d55f8c215245387b9300487d9d4bf3b79 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=04069d8d55f8c215245387b… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:47 2020 +0100 vkd3d-compiler: Add formatting options. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 54 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index c05ec6a..4812d47 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -29,7 +29,7 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" -#define MAX_COMPILE_OPTIONS 2 +#define MAX_COMPILE_OPTIONS 3 enum { @@ -40,6 +40,7 @@ enum OPTION_PRINT_TARGET_TYPES, OPTION_STRIP_DEBUG, OPTION_VERSION, + OPTION_TEXT_FORMATTING, }; static const struct source_type_info @@ -146,6 +147,10 @@ static void print_usage(const char *program_name) " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" " output file is specified, output will be written to\n" " standard output.\n" + " --formatting=<type> Specify the formatting options for text output.\n" + " Valid values are 'none', 'print', 'colour', 'indent',\n" + " 'show-byte-offset', 'no-header', and 'friendly-names'.\n" + " Default is --formatting=friendly-names,indent.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" @@ -221,6 +226,45 @@ static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer return false; } +static bool parse_formatting(uint32_t *formatting, char *arg) +{ + static const struct formatting_option + { + char *name; + enum vkd3d_shader_compile_option_formatting_flags value; + } + opts[] = + { + {"none", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE }, + {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR }, + {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT }, + {"show-byte-offset", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET}, + {"no-header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER }, + {"friendly-names", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES }, + }; + char *tok; + + for (tok = strtok(arg, ","); tok; tok = strtok(NULL, ",")) + { + unsigned int i; + for (i = 0; i < ARRAY_SIZE(opts); ++i) + { + if (!strcmp(tok, opts[i].name)) + { + *formatting |= opts[i].value; + break; + } + } + if (i == ARRAY_SIZE(opts)) + { + fprintf(stderr, "Invalid formatting '%s' specified.\n", tok); + return false; + } + } + + return true; +} + static enum vkd3d_shader_source_type parse_source_type(const char *source) { unsigned int i; @@ -292,6 +336,7 @@ static bool validate_target_type( static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_buffer_uav buffer_uav; + enum vkd3d_shader_compile_option_formatting_flags formatting = 0; int option; static struct option long_options[] = @@ -299,6 +344,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"help", no_argument, NULL, OPTION_HELP}, {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"output", required_argument, NULL, OPTION_OUTPUT}, + {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, @@ -339,6 +385,12 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->output_filename = optarg; break; + case OPTION_TEXT_FORMATTING: + if (!parse_formatting(&formatting, optarg)) + return false; + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, formatting); + break; + case OPTION_PRINT_SOURCE_TYPES: options->print_source_types = true; return true;

1 0

Zebediah Figura : vkd3d-shader: Rename VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 to VKD3D_SHADER_MINIMUM_PRECISION_FIXED_8_2.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: d8bea777a13cbe020f82bca96b800ec4ad823085 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d8bea777a13cbe020f82bca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 4 17:43:59 2020 -0500 vkd3d-shader: Rename VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 to VKD3D_SHADER_MINIMUM_PRECISION_FIXED_8_2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3752540..fe6e958 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1027,7 +1027,7 @@ enum vkd3d_shader_minimum_precision /** 16-bit floating-point. */ VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_16 = 1, /** 10-bit fixed point (2 integer and 8 fractional bits). */ - VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, + VKD3D_SHADER_MINIMUM_PRECISION_FIXED_8_2 = 2, /** 16-bit signed integer. */ VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, /** 16-bit unsigned integer. */

1 0

Zebediah Figura : vkd3d-shader: Read the SM5 resource type instruction modifier.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: c3a5df7375ba5d172fe6dd4d7987ed34777bc198 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c3a5df7375ba5d172fe6dd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 4 17:57:04 2020 -0500 vkd3d-shader: Read the SM5 resource type instruction modifier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 74 ++++++++++++++++++++---------- libs/vkd3d-shader/trace.c | 77 +++++++++++++------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 83 insertions(+), 69 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 94e4621..c2690d8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -21,7 +21,11 @@ #define VKD3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) -#define VKD3D_SM4_MODIFIER_AOFFIMMI 0x1 +#define VKD3D_SM4_MODIFIER_MASK 0x3fu + +#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 +#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM5_MODIFIER_RESOURCE_TYPE_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 @@ -303,6 +307,12 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum vkd3d_sm4_instruction_modifier +{ + VKD3D_SM4_MODIFIER_AOFFIMMI = 0x1, + VKD3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, +}; + enum vkd3d_sm4_register_type { VKD3D_SM4_RT_TEMP = 0x00, @@ -1734,32 +1744,49 @@ static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_shader_instruction *ins) { - static const DWORD recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER - | VKD3D_SM4_MODIFIER_AOFFIMMI - | VKD3D_SM4_AOFFIMMI_U_MASK - | VKD3D_SM4_AOFFIMMI_V_MASK - | VKD3D_SM4_AOFFIMMI_W_MASK; + enum vkd3d_sm4_instruction_modifier modifier_type = modifier & VKD3D_SM4_MODIFIER_MASK; - if (modifier & ~recognized_bits) + switch (modifier_type) { - WARN("Unhandled modifier 0x%08x.\n", modifier); - } - else - { - /* Bit fields are used for sign extension */ - struct + case VKD3D_SM4_MODIFIER_AOFFIMMI: { - int u : 4; - int v : 4; - int w : 4; + static const DWORD recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER + | VKD3D_SM4_MODIFIER_MASK + | VKD3D_SM4_AOFFIMMI_U_MASK + | VKD3D_SM4_AOFFIMMI_V_MASK + | VKD3D_SM4_AOFFIMMI_W_MASK; + + /* Bit fields are used for sign extension. */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } aoffimmi; + + if (modifier & ~recognized_bits) + FIXME("Unhandled instruction modifier %#x.\n", modifier); + + aoffimmi.u = (modifier & VKD3D_SM4_AOFFIMMI_U_MASK) >> VKD3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & VKD3D_SM4_AOFFIMMI_V_MASK) >> VKD3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & VKD3D_SM4_AOFFIMMI_W_MASK) >> VKD3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + break; + } + + case VKD3D_SM5_MODIFIER_RESOURCE_TYPE: + { + enum vkd3d_sm4_resource_type resource_type + = (modifier & VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; + + ins->resource_type = resource_type_table[resource_type]; + break; } - aoffimmi; - aoffimmi.u = (modifier & VKD3D_SM4_AOFFIMMI_U_MASK) >> VKD3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & VKD3D_SM4_AOFFIMMI_V_MASK) >> VKD3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & VKD3D_SM4_AOFFIMMI_W_MASK) >> VKD3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + + default: + FIXME("Unhandled instruction modifier %#x.\n", modifier); } } @@ -1818,6 +1845,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha ins->dst = priv->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; + ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b0ad387..f4a93b4 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -494,6 +494,29 @@ static void shader_dump_shader_input_sysval_semantic(struct vkd3d_string_buffer shader_addline(buffer, "unknown_shader_input_sysval_semantic(%#x)", semantic); } +static void shader_dump_resource_type(struct vkd3d_string_buffer *buffer, enum vkd3d_shader_resource_type type) +{ + static const char *const resource_type_names[] = + { + /* VKD3D_SHADER_RESOURCE_NONE */ "none", + /* VKD3D_SHADER_RESOURCE_BUFFER */ "buffer", + /* VKD3D_SHADER_RESOURCE_TEXTURE_1D */ "texture1d", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2D */ "texture2d", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMS */ "texture2dms", + /* VKD3D_SHADER_RESOURCE_TEXTURE_3D */ "texture3d", + /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBE */ "texturecube", + /* VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ "texture1darray", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ "texture2darray", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ "texture2dmsarray", + /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", + }; + + if (type <= ARRAY_SIZE(resource_type_names)) + shader_addline(buffer, "%s", resource_type_names[type]); + else + shader_addline(buffer, "unknown"); +} + static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, const struct vkd3d_shader_semantic *semantic, unsigned int flags, const struct vkd3d_shader_version *shader_version) @@ -527,52 +550,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "_resource_"); else shader_addline(buffer, "_uav_"); - switch (semantic->resource_type) - { - case VKD3D_SHADER_RESOURCE_BUFFER: - shader_addline(buffer, "buffer"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_1D: - shader_addline(buffer, "texture1d"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2D: - shader_addline(buffer, "texture2d"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2DMS: - shader_addline(buffer, "texture2dms"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_3D: - shader_addline(buffer, "texture3d"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_CUBE: - shader_addline(buffer, "texturecube"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY: - shader_addline(buffer, "texture1darray"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY: - shader_addline(buffer, "texture2darray"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: - shader_addline(buffer, "texture2dmsarray"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: - shader_addline(buffer, "texturecubearray"); - break; - - default: - shader_addline(buffer, "unknown"); - break; - } + shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->resource.reg.reg.type == VKD3DSPR_UAV) shader_dump_uav_flags(buffer, flags); switch (semantic->resource_data_type) @@ -1522,6 +1500,13 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w); } + if (ins->resource_type != VKD3D_SHADER_RESOURCE_NONE) + { + shader_addline(buffer, "("); + shader_dump_resource_type(buffer, ins->resource_type); + shader_addline(buffer, ")"); + } + for (i = 0; i < ins->dst_count; ++i) { shader_dump_ins_modifiers(buffer, &ins->dst[i]); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 25d6216..9b369d8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -764,6 +764,7 @@ struct vkd3d_shader_instruction const struct vkd3d_shader_dst_param *dst; const struct vkd3d_shader_src_param *src; struct vkd3d_shader_texel_offset texel_offset; + enum vkd3d_shader_resource_type resource_type; bool coissue; const struct vkd3d_shader_src_param *predicate; union

1 0

Zebediah Figura : vkd3d-shader: Read the SM5 resource data type instruction modifier.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: 7dd8c15d49332b73d75aa6754a1668483b3ad78d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7dd8c15d49332b73d75aa67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 4 17:57:05 2020 -0500 vkd3d-shader: Read the SM5 resource data type instruction modifier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 16 ++++++++++ libs/vkd3d-shader/trace.c | 51 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index c2690d8..973a80d 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -23,6 +23,9 @@ #define VKD3D_SM4_MODIFIER_MASK 0x3fu +#define VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT 6 +#define VKD3D_SM5_MODIFIER_DATA_TYPE_MASK (0xffffu << VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT) + #define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 #define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) @@ -311,6 +314,7 @@ enum vkd3d_sm4_instruction_modifier { VKD3D_SM4_MODIFIER_AOFFIMMI = 0x1, VKD3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, + VKD3D_SM5_MODIFIER_DATA_TYPE = 0x3, }; enum vkd3d_sm4_register_type @@ -1776,6 +1780,17 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh break; } + case VKD3D_SM5_MODIFIER_DATA_TYPE: + { + DWORD components = (modifier & VKD3D_SM5_MODIFIER_DATA_TYPE_MASK) >> VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT; + enum vkd3d_sm4_data_type data_type = components & 0xf; + + if ((components & 0xfff0) != (components & 0xf) * 0x1110) + FIXME("Components (%#x) have different data types.\n", components); + ins->resource_data_type = data_type_table[data_type]; + break; + } + case VKD3D_SM5_MODIFIER_RESOURCE_TYPE: { enum vkd3d_sm4_resource_type resource_type @@ -1846,6 +1861,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_data_type = VKD3D_DATA_FLOAT; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index f4a93b4..fa35bc7 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -517,6 +517,27 @@ static void shader_dump_resource_type(struct vkd3d_string_buffer *buffer, enum v shader_addline(buffer, "unknown"); } +static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, enum vkd3d_data_type type) +{ + static const char *const data_type_names[] = + { + /* VKD3D_DATA_FLOAT */ "(float)", + /* VKD3D_DATA_INT */ "(int)", + /* VKD3D_DATA_RESOURCE */ "(resource)", + /* VKD3D_DATA_SAMPLER */ "(sampler)", + /* VKD3D_DATA_UAV */ "(uav)", + /* VKD3D_DATA_UINT */ "(uint)", + /* VKD3D_DATA_UNORM */ "(unorm)", + /* VKD3D_DATA_SNORM */ "(snorm)", + /* VKD3D_DATA_OPAQUE */ "(opaque)", + }; + + if (type <= ARRAY_SIZE(data_type_names)) + shader_addline(buffer, "%s", data_type_names[type]); + else + shader_addline(buffer, "(unknown)"); +} + static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, const struct vkd3d_shader_semantic *semantic, unsigned int flags, const struct vkd3d_shader_version *shader_version) @@ -553,32 +574,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->resource.reg.reg.type == VKD3DSPR_UAV) shader_dump_uav_flags(buffer, flags); - switch (semantic->resource_data_type) - { - case VKD3D_DATA_FLOAT: - shader_addline(buffer, " (float)"); - break; - - case VKD3D_DATA_INT: - shader_addline(buffer, " (int)"); - break; - - case VKD3D_DATA_UINT: - shader_addline(buffer, " (uint)"); - break; - - case VKD3D_DATA_UNORM: - shader_addline(buffer, " (unorm)"); - break; - - case VKD3D_DATA_SNORM: - shader_addline(buffer, " (snorm)"); - break; - - default: - shader_addline(buffer, " (unknown)"); - break; - } + shader_dump_data_type(buffer, semantic->resource_data_type); } else { @@ -1507,6 +1503,9 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, ")"); } + if (ins->resource_data_type != VKD3D_DATA_FLOAT) + shader_dump_data_type(buffer, ins->resource_data_type); + for (i = 0; i < ins->dst_count; ++i) { shader_dump_ins_modifiers(buffer, &ins->dst[i]); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9b369d8..1acb01f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -765,6 +765,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; + enum vkd3d_data_type resource_data_type; bool coissue; const struct vkd3d_shader_src_param *predicate; union

1 0

Isabella Bosia : vkd3d-shader: Implement vkd3d_spirv_binary_to_text helper.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: e75a0d6f144797d4871ecaec08313b2e46998b0c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e75a0d6f144797d4871ecae… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:40 2020 +0100 vkd3d-shader: Implement vkd3d_spirv_binary_to_text helper. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb251a4..6a6d187 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -50,36 +50,62 @@ static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_spirv_environm } } -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) +static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment, uint32_t options, struct vkd3d_shader_code *out) { - const static uint32_t options - = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; spv_diagnostic diagnostic = NULL; spv_text text = NULL; spv_context context; - spv_result_t ret; + spv_result_t spvret; + enum vkd3d_result result = VKD3D_OK; context = spvContextCreate(spv_target_env_from_vkd3d(environment)); - if (!(ret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), + if (!(spvret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), options, &text, &diagnostic))) { - const char *str, *current = text->str; - while ((str = strchr(current, '\n'))) + void *code = vkd3d_malloc(text->length); + if (code) { - TRACE("%.*s\n", (int)(str - current), current); - current = str + 1; + memcpy(code, text->str, text->length); + out->size = text->length; + out->code = code; } + else + result = VKD3D_ERROR_OUT_OF_MEMORY; } else { - FIXME("Failed to convert SPIR-V binary to text, ret %d.\n", ret); + FIXME("Failed to convert SPIR-V binary to text, ret %d.\n", spvret); FIXME("Diagnostic message: %s.\n", debugstr_a(diagnostic->error)); + result = VKD3D_ERROR; } spvTextDestroy(text); spvDiagnosticDestroy(diagnostic); spvContextDestroy(context); + + return result; +} + +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) +{ + const static uint32_t options + = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; + struct vkd3d_shader_code text; + + if (!vkd3d_spirv_binary_to_text(spirv, environment, options, &text)) + { + const char *str, *current = text.code; + while ((str = strchr(current, '\n'))) + { + TRACE("%.*s\n", (int)(str - current), current); + current = str + 1; + } + + vkd3d_shader_free_shader_code(&text); + } } static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv,

1 0