February 2022 - Wine-commits

Henri Verbeet : vkd3d: Properly compare integers in compare_register_range().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: 41b445d965810dd35f1c5662d17f2ff1a0fc0987 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41b445d965810dd35f1c566… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:52 2022 +0100 vkd3d: Properly compare integers in compare_register_range(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 0cf0c55..ffd92d1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -821,13 +821,13 @@ static int compare_register_range(const void *a, const void *b) const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; int ret; - if ((ret = range_a->type - range_b->type)) + if ((ret = vkd3d_u32_compare(range_a->type, range_b->type))) return ret; - if ((ret = range_a->register_space - range_b->register_space)) + if ((ret = vkd3d_u32_compare(range_a->register_space, range_b->register_space))) return ret; - return range_a->base_register_idx - range_b->base_register_idx; + return vkd3d_u32_compare(range_a->base_register_idx, range_b->base_register_idx); } static int compare_descriptor_range(const void *a, const void *b)

1 0

Henri Verbeet : vkd3d-shader: Handle "mixed" data in vkd3d_shader_scan_typed_resource_declaration().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: 2a14718fe57b25fa5238ac0264b7f35681248f3f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2a14718fe57b25fa5238ac0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:46 2022 +0100 vkd3d-shader: Handle "mixed" data in vkd3d_shader_scan_typed_resource_declaration(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fece054..1576411 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1197,15 +1197,17 @@ enum vkd3d_shader_resource_type enum vkd3d_shader_resource_data_type { /** Unsigned normalized integer. */ - VKD3D_SHADER_RESOURCE_DATA_UNORM = 0x1, + VKD3D_SHADER_RESOURCE_DATA_UNORM = 0x1, /** Signed normalized integer. */ - VKD3D_SHADER_RESOURCE_DATA_SNORM = 0x2, + VKD3D_SHADER_RESOURCE_DATA_SNORM = 0x2, /** Signed integer. */ - VKD3D_SHADER_RESOURCE_DATA_INT = 0x3, + VKD3D_SHADER_RESOURCE_DATA_INT = 0x3, /** Unsigned integer. */ - VKD3D_SHADER_RESOURCE_DATA_UINT = 0x4, - /** IEEE floating-point. */ - VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, + VKD3D_SHADER_RESOURCE_DATA_UINT = 0x4, + /** IEEE single-precision floating-point. */ + VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, + /** Undefined/type-less. \since 1.3 */ + VKD3D_SHADER_RESOURCE_DATA_MIXED = 0x6, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_DATA_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a25e28a..298289c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -477,6 +477,8 @@ struct vkd3d_shader_scan_context } *uav_ranges; size_t uav_ranges_size; size_t uav_range_count; + + enum vkd3d_shader_api_version api_version; }; static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, @@ -484,11 +486,22 @@ static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *con struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context) { + unsigned int i; + memset(context, 0, sizeof(*context)); context->scan_descriptor_info = scan_descriptor_info; context->message_context = message_context; context->location.source_name = compile_info->source_name; context->location.line = 2; /* Line 1 is the version token. */ + context->api_version = VKD3D_SHADER_API_VERSION_1_2; + + for (i = 0; i < compile_info->option_count; ++i) + { + const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; + + if (option->name == VKD3D_SHADER_COMPILE_OPTION_API_VERSION) + context->api_version = option->value; + } } static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context) @@ -741,11 +754,23 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca case VKD3D_DATA_FLOAT: resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; break; + case VKD3D_DATA_MIXED: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_MIXED; + break; default: ERR("Invalid resource data type %#x.\n", semantic->resource_data_type[0]); resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; break; } + + if (context->api_version < VKD3D_SHADER_API_VERSION_1_3 + && resource_data_type >= VKD3D_SHADER_RESOURCE_DATA_MIXED) + { + ERR("Invalid resource data type %#x for API version %#x.\n", + semantic->resource_data_type[0], context->api_version); + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; + } + vkd3d_shader_scan_resource_declaration(context, &semantic->resource, semantic->resource_type, resource_data_type); }

1 0

Henri Verbeet : vkd3d-shader: Handle double-precision floating-point data in vkd3d_shader_scan_typed_resource_declaration().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: 850badd38ca3ab786fe2d11328ac6f9e023f93b4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=850badd38ca3ab786fe2d11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:47 2022 +0100 vkd3d-shader: Handle double-precision floating-point data in vkd3d_shader_scan_typed_resource_declaration(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 8 ++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1576411..df15047 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1208,6 +1208,14 @@ enum vkd3d_shader_resource_data_type VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, /** Undefined/type-less. \since 1.3 */ VKD3D_SHADER_RESOURCE_DATA_MIXED = 0x6, + /** IEEE double-precision floating-point. \since 1.3 */ + VKD3D_SHADER_RESOURCE_DATA_DOUBLE = 0x7, + /** Continuation of the previous component. For example, 64-bit + * double-precision floating-point data may be returned as two 32-bit + * components, with the first component (containing the LSB) specified as + * VKD3D_SHADER_RESOURCE_DATA_DOUBLE, and the second component specified + * as VKD3D_SHADER_RESOURCE_DATA_CONTINUED. \since 1.3 */ + VKD3D_SHADER_RESOURCE_DATA_CONTINUED = 0x8, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_DATA_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 298289c..b5b66e1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -757,6 +757,12 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca case VKD3D_DATA_MIXED: resource_data_type = VKD3D_SHADER_RESOURCE_DATA_MIXED; break; + case VKD3D_DATA_DOUBLE: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_DOUBLE; + break; + case VKD3D_DATA_CONTINUED: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_CONTINUED; + break; default: ERR("Invalid resource data type %#x.\n", semantic->resource_data_type[0]); resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT;

1 0

Henri Verbeet : vkd3d-shader/hlsl: Properly compare integers in compare_param_hlsl_types().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: 790ab754d5ac4fb1a723e16b22dbeea1a52a12b8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=790ab754d5ac4fb1a723e16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:48 2022 +0100 vkd3d-shader/hlsl: Properly compare integers in compare_param_hlsl_types(). As pointed out by Giovanni Mascellani, modular subtraction doesn't produce a total order; in particular, it's not transitive. The nature of the types being compared here makes it unlikely this will be an issue in practice, but it's both fragile and setting a poor example. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 5 +++++ libs/vkd3d-shader/hlsl.c | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 1e19758..ac55685 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -158,6 +158,11 @@ static inline uint32_t vkd3d_make_u32(uint16_t low, uint16_t high) return low | ((uint32_t)high << 16); } +static inline int vkd3d_u32_compare(uint32_t x, uint32_t y) +{ + return (x > y) - (x < y); +} + static inline int ascii_isupper(int c) { return 'A' <= c && c <= 'Z'; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8197fa9..689b9da 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -786,26 +786,26 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls { int r; - if (t1->type != t2->type) + if ((r = vkd3d_u32_compare(t1->type, t2->type))) { if (!((t1->type == HLSL_CLASS_SCALAR && t2->type == HLSL_CLASS_VECTOR) || (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_SCALAR))) - return t1->type - t2->type; + return r; } - if (t1->base_type != t2->base_type) - return t1->base_type - t2->base_type; + if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type))) + return r; if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) { - if (t1->sampler_dim != t2->sampler_dim) - return t1->sampler_dim - t2->sampler_dim; + if ((r = vkd3d_u32_compare(t1->sampler_dim, t2->sampler_dim))) + return r; if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC && (r = compare_param_hlsl_types(t1->e.resource_format, t2->e.resource_format))) return r; } - if (t1->dimx != t2->dimx) - return t1->dimx - t2->dimx; - if (t1->dimy != t2->dimy) - return t1->dimx - t2->dimx; + if ((r = vkd3d_u32_compare(t1->dimx, t2->dimx))) + return r; + if ((r = vkd3d_u32_compare(t1->dimy, t2->dimy))) + return r; if (t1->type == HLSL_CLASS_STRUCT) { struct list *t1cur, *t2cur; @@ -830,8 +830,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->type == HLSL_CLASS_ARRAY) { - if (t1->e.array.elements_count != t2->e.array.elements_count) - return t1->e.array.elements_count - t2->e.array.elements_count; + if ((r = vkd3d_u32_compare(t1->e.array.elements_count, t2->e.array.elements_count))) + return r; return compare_param_hlsl_types(t1->e.array.type, t2->e.array.type); }

1 0

Henri Verbeet : vkd3d-shader/hlsl: Respect the requested target type.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: f5c4c06090d45598b99caf40ebf02e2afa8d580f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5c4c06090d45598b99caf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:43 2022 +0100 vkd3d-shader/hlsl: Respect the requested target type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 5 +++++ libs/vkd3d-shader/hlsl.c | 17 +++++++++++++-- libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl_codegen.c | 19 ++++++++++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- libs/vkd3d-utils/vkd3d_utils_main.c | 36 ++++++++++++++++++++++++++++++++ programs/vkd3d-compiler/main.c | 4 ++++ 8 files changed, 79 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6ce9819..be2be3c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -581,6 +581,11 @@ enum vkd3d_shader_target_type VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, VKD3D_SHADER_TARGET_D3D_ASM, + /** + * Legacy Direct3D byte-code. This is the format used for Direct3D shader + * model 1, 2, and 3 shaders. + */ + VKD3D_SHADER_TARGET_D3D_BYTECODE, /** * A 'Tokenized Program Format' shader embedded in a DXBC container. This is * the format used for Direct3D shader model 4 and 5 shaders. diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a9a4277..8197fa9 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1952,7 +1952,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) } int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; struct hlsl_ir_function_decl *entry_func; @@ -1976,6 +1976,19 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE && profile->major_version > 3) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, + "The '%s' target profile is incompatible with the 'd3dbc' target type.", profile->name); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + else if (compile_info->target_type == VKD3D_SHADER_TARGET_DXBC_TPF && profile->major_version < 4) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, + "The '%s' target profile is incompatible with the 'dxbc-tpf' target type.", profile->name); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (!hlsl_ctx_init(&ctx, compile_info->source_name, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -2009,7 +2022,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } - ret = hlsl_emit_dxbc(&ctx, entry_func, dxbc); + ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); hlsl_ctx_cleanup(&ctx); return ret; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 043d7fb..243ed72 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -711,7 +711,8 @@ bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e416647..837d39e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1611,7 +1611,8 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere return ret; } -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) +int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { struct hlsl_block *const body = &entry_func->body; struct hlsl_ir_var *var; @@ -1697,8 +1698,16 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun if (ctx->result) return ctx->result; - if (ctx->profile->major_version < 4) - return hlsl_sm1_write(ctx, entry_func, out); - else - return hlsl_sm4_write(ctx, entry_func, out); + switch (target_type) + { + case VKD3D_SHADER_TARGET_D3D_BYTECODE: + return hlsl_sm1_write(ctx, entry_func, out); + + case VKD3D_SHADER_TARGET_DXBC_TPF: + return hlsl_sm4_write(ctx, entry_func, out); + + default: + ERR("Unsupported shader target type %#x.\n", target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ae0662b..a25e28a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1399,6 +1399,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( static const enum vkd3d_shader_target_type hlsl_types[] = { + VKD3D_SHADER_TARGET_D3D_BYTECODE, VKD3D_SHADER_TARGET_DXBC_TPF, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5ab8494..50c1e9d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -116,6 +116,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET = 5018, VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS = 5019, + VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE = 5020, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, @@ -1094,7 +1095,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context); + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index ee3bfb4..006e5e2 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -163,10 +163,34 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; const D3D_SHADER_MACRO *macro; + size_t profile_len, i; char *messages; HRESULT hr; int ret; + static const char * const d3dbc_profiles[] = + { + "fx_2_", + + "ps.1.", + "ps.2.", + "ps.3.", + + "ps_1_", + "ps_2_", + "ps_3_", + + "vs.1.", + "vs.2.", + "vs.3.", + + "vs_1_", + "vs_2_", + "vs_3_", + + "tx_1_", + }; + TRACE("data %p, data_size %lu, filename %s, macros %p, include %p, entry_point %s, " "profile %s, flags %#x, effect_flags %#x, secondary_flags %#x, secondary_data %p, " "secondary_data_size %lu, shader_blob %p, messages_blob %p.\n", @@ -195,6 +219,18 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; + profile_len = strlen(profile); + for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) + { + size_t len = strlen(d3dbc_profiles[i]); + + if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) + { + compile_info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; + break; + } + } + preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; preprocess_info.next = &hlsl_info; preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index c974c9a..f1a6b47 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -97,6 +97,10 @@ target_type_info[] = {VKD3D_SHADER_TARGET_D3D_ASM, "d3d-asm", "A shader in Direct3D assembly form.\n", false}, + {VKD3D_SHADER_TARGET_D3D_BYTECODE, + "d3dbc", "Legacy Direct3D byte-code.\n" + " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", + true}, {VKD3D_SHADER_TARGET_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.\n",

1 0

Henri Verbeet : vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_API_VERSION.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: 22b02ed59ff19623204919de31719039e6963b3d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22b02ed59ff19623204919d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:44 2022 +0100 vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_API_VERSION. Analogous to vkd3d_api_version for libvkd3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 11 +++++++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 17 +++++++++++++---- libs/vkd3d/state.c | 18 ++++++++++++++---- programs/vkd3d-compiler/main.c | 3 ++- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index be2be3c..fece054 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -38,6 +38,15 @@ extern "C" { * compilation, transformation, and reflection of GPU shaders. */ +/** \since 1.3 */ +enum vkd3d_shader_api_version +{ + VKD3D_SHADER_API_VERSION_1_0, + VKD3D_SHADER_API_VERSION_1_1, + VKD3D_SHADER_API_VERSION_1_2, + VKD3D_SHADER_API_VERSION_1_3, +}; + /** The type of a chained structure. */ enum vkd3d_shader_structure_type { @@ -115,6 +124,8 @@ enum vkd3d_shader_compile_option_name VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, /** \a value is a member of enum vkd3d_shader_compile_option_formatting_flags. */ VKD3D_SHADER_COMPILE_OPTION_FORMATTING = 0x00000003, + /** \a value is a member of enum vkd3d_shader_api_version. \since 1.3 */ + VKD3D_SHADER_COMPILE_OPTION_API_VERSION = 0x00000004, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 006e5e2..5534453 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -158,7 +158,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[1]; + struct vkd3d_shader_compile_option options[2]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -208,6 +208,10 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (messages_blob) *messages_blob = NULL; + option = &options[0]; + option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; + option->value = VKD3D_SHADER_API_VERSION_1_3; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; compile_info.source.code = data; @@ -215,7 +219,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; compile_info.target_type = VKD3D_SHADER_TARGET_DXBC_TPF; compile_info.options = options; - compile_info.option_count = 0; + compile_info.option_count = 1; compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; @@ -310,6 +314,11 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; int ret; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", data, size, debugstr_a(filename), macros, include, preprocessed_blob, messages_blob); @@ -322,8 +331,8 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename compile_info.source.size = size; compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; compile_info.target_type = VKD3D_SHADER_TARGET_NONE; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 91f6e27..0cf0c55 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1768,6 +1768,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device, VkResult vr; int ret; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; stage_desc->pNext = NULL; stage_desc->flags = 0; @@ -1785,8 +1790,8 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; @@ -1814,14 +1819,19 @@ static int vkd3d_scan_dxbc(const D3D12_SHADER_BYTECODE *code, { struct vkd3d_shader_compile_info compile_info; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = descriptor_info; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index f1a6b47..2f330f6 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -34,7 +34,7 @@ #include <term.h> #endif -#define MAX_COMPILE_OPTIONS 3 +#define MAX_COMPILE_OPTIONS 4 enum { @@ -729,6 +729,7 @@ int main(int argc, char **argv) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info;

1 0

Henri Verbeet : vkd3d-shader: Explicitly handle VKD3D_DATA_MIXED in vkd3d_component_type_from_data_type().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: ab45f0cafd3a8ebf4f388bf4cbc55fa3f20e523a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ab45f0cafd3a8ebf4f388bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:45 2022 +0100 vkd3d-shader: Explicitly handle VKD3D_DATA_MIXED in vkd3d_component_type_from_data_type(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 50c1e9d..2deaa46 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1114,6 +1114,8 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty return VKD3D_SHADER_COMPONENT_DOUBLE; default: FIXME("Unhandled data type %#x.\n", data_type); + /* fall-through */ + case VKD3D_DATA_MIXED: return VKD3D_SHADER_COMPONENT_UINT; } }

1 0

Alexandre Julliard : Wine release 7.3
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: website Branch: master Commit: 1c03fb334b2065a52e189a708048e0fe15cbd23a URL: https://source.winehq.org/git/website.git/?a=commit;h=1c03fb334b2065a52e189… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 21:17:57 2022 +0100 Wine release 7.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022022502.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022022502.xml b/news/en/2022022502.xml new file mode 100644 index 00000000..19457b17 --- /dev/null +++ b/news/en/2022022502.xml @@ -0,0 +1,17 @@ +<news> +<date>February 25, 2022</date> +<title>Wine 7.3 Released</title> +<body> + The Wine development release 7.3 is now available. + <a href="{$root}/announce/7.3">What's new</a> in this release: +<ul> + <li>More large scale cleanups to support 'long' type.</li> + <li>Proper support for API sets.</li> + <li>Progress on the PE conversion of USER32 and WineALSA.</li> + <li>A number of HID joystick fixes.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zebediah Figura : winegstreamer: Do not use multiple cleanup labels in wg_transform_create().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: aa867c6cfba48a63179088ec6381c73488853659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa867c6cfba48a63179088ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 25 11:42:59 2022 -0600 winegstreamer: Do not use multiple cleanup labels in wg_transform_create(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d316071cf60..0772915e46f 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -158,25 +158,25 @@ NTSTATUS wg_transform_create(void *args) if (!(transform = calloc(1, sizeof(*transform)))) return STATUS_NO_MEMORY; if (!(transform->container = gst_bin_new("wg_transform"))) - goto out_free_transform; + goto out; if (!(src_caps = wg_format_to_caps(&input_format))) - goto out_free_container; + goto out; if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) - goto out_free_src_caps; + goto out; transform->my_src = gst_pad_new_from_template(template, "src"); g_object_unref(template); if (!transform->my_src) - goto out_free_src_caps; + goto out; if (!(sink_caps = wg_format_to_caps(&output_format))) - goto out_free_src_pad; + goto out; if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) - goto out_free_sink_caps; + goto out; transform->my_sink = gst_pad_new_from_template(template, "sink"); g_object_unref(template); if (!transform->my_sink) - goto out_free_sink_caps; + goto out; gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); @@ -187,7 +187,7 @@ NTSTATUS wg_transform_create(void *args) */ media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); if (!(raw_caps = gst_caps_new_empty_simple(media_type))) - goto out_free_sink_pad; + goto out; switch (input_format.major_type) { @@ -196,7 +196,7 @@ NTSTATUS wg_transform_create(void *args) || !transform_append_element(transform, element, &first, &last)) { gst_caps_unref(raw_caps); - goto out_free_sink_pad; + goto out; } break; @@ -205,7 +205,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_UNKNOWN: GST_FIXME("Format %u not implemented!", input_format.major_type); gst_caps_unref(raw_caps); - goto out_free_sink_pad; + goto out; } gst_caps_unref(raw_caps); @@ -224,22 +224,22 @@ NTSTATUS wg_transform_create(void *args) */ if (!(element = create_element("audioconvert", "base")) || !transform_append_element(transform, element, &first, &last)) - goto out_free_sink_pad; + goto out; if (!(element = create_element("audioresample", "base")) || !transform_append_element(transform, element, &first, &last)) - goto out_free_sink_pad; + goto out; break; case WG_MAJOR_TYPE_VIDEO: case WG_MAJOR_TYPE_WMA: case WG_MAJOR_TYPE_UNKNOWN: GST_FIXME("Format %u not implemented!", output_format.major_type); - goto out_free_sink_pad; + goto out; } gst_element_set_state(transform->container, GST_STATE_PAUSED); if (!gst_element_get_state(transform->container, NULL, NULL, -1)) - goto out_free_sink_pad; + goto out; gst_caps_unref(sink_caps); gst_caps_unref(src_caps); @@ -248,17 +248,17 @@ NTSTATUS wg_transform_create(void *args) params->transform = transform; return STATUS_SUCCESS; -out_free_sink_pad: - gst_object_unref(transform->my_sink); -out_free_sink_caps: - gst_caps_unref(sink_caps); -out_free_src_pad: - gst_object_unref(transform->my_src); -out_free_src_caps: - gst_caps_unref(src_caps); -out_free_container: - gst_object_unref(transform->container); -out_free_transform: +out: + if (transform->my_sink) + gst_object_unref(transform->my_sink); + if (sink_caps) + gst_caps_unref(sink_caps); + if (transform->my_src) + gst_object_unref(transform->my_src); + if (src_caps) + gst_caps_unref(src_caps); + if (transform->container) + gst_object_unref(transform->container); free(transform); GST_ERROR("Failed to create winegstreamer transform."); return status;

1 0

Rémi Bernon : winegstreamer: Link the container pads and activate ours.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 9196fee58349558593fd7edf4768b189c25f6293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9196fee58349558593fd7edf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 25 11:43:00 2022 -0600 winegstreamer: Link the container pads and activate ours. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0772915e46f..c5aa4acb2cc 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -46,6 +46,7 @@ struct wg_transform { GstElement *container; GstPad *my_src, *my_sink; + GstPad *their_sink, *their_src; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -64,6 +65,8 @@ NTSTATUS wg_transform_destroy(void *args) struct wg_transform *transform = args; gst_element_set_state(transform->container, GST_STATE_NULL); + g_object_unref(transform->their_sink); + g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); @@ -237,6 +240,19 @@ NTSTATUS wg_transform_create(void *args) goto out; } + if (!(transform->their_sink = gst_element_get_static_pad(first, "sink"))) + goto out; + if (!(transform->their_src = gst_element_get_static_pad(last, "src"))) + goto out; + if (gst_pad_link(transform->my_src, transform->their_sink) < 0) + goto out; + if (gst_pad_link(transform->their_src, transform->my_sink) < 0) + goto out; + if (!gst_pad_set_active(transform->my_sink, 1)) + goto out; + if (!gst_pad_set_active(transform->my_src, 1)) + goto out; + gst_element_set_state(transform->container, GST_STATE_PAUSED); if (!gst_element_get_state(transform->container, NULL, NULL, -1)) goto out; @@ -249,6 +265,10 @@ NTSTATUS wg_transform_create(void *args) return STATUS_SUCCESS; out: + if (transform->their_sink) + gst_object_unref(transform->their_sink); + if (transform->their_src) + gst_object_unref(transform->their_src); if (transform->my_sink) gst_object_unref(transform->my_sink); if (sink_caps)

1 0