January 2024 - Wine-commits

Zebediah Figura : vkd3d-shader/d3dbc: Assign unique register indices for VKD3DSPR_RASTOUT.
by Alexandre Julliard 04 Jan '24

04 Jan '24

Module: vkd3d Branch: master Commit: 1ce7e3d8b1e675f6195d05f60eb0c2cefe8c8939 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ce7e3d8b1e675f6195d05f60eb0c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 27 12:44:38 2023 -0500 vkd3d-shader/d3dbc: Assign unique register indices for VKD3DSPR_RASTOUT. --- libs/vkd3d-shader/d3dbc.c | 6 +++--- libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/vkd3d_shader_api.c | 10 +++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index ce731634..67f9e280 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -645,15 +645,15 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser * { case 0: return add_signature_element(sm1, true, "POSITION", 0, - VKD3D_SHADER_SV_POSITION, register_index, is_dcl, mask); + VKD3D_SHADER_SV_POSITION, SM1_RASTOUT_REGISTER_OFFSET + register_index, is_dcl, mask); case 1: return add_signature_element(sm1, true, "FOG", 0, - VKD3D_SHADER_SV_NONE, register_index, is_dcl, 0x1); + VKD3D_SHADER_SV_NONE, SM1_RASTOUT_REGISTER_OFFSET + register_index, is_dcl, 0x1); case 2: return add_signature_element(sm1, true, "PSIZE", 0, - VKD3D_SHADER_SV_NONE, register_index, is_dcl, 0x1); + VKD3D_SHADER_SV_NONE, SM1_RASTOUT_REGISTER_OFFSET + register_index, is_dcl, 0x1); default: vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_INVALID_REGISTER_INDEX, diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 01325197..c6ac0da0 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -916,7 +916,7 @@ static bool shader_dst_param_io_normalise(struct vkd3d_shader_dst_param *dst_par break; case VKD3DSPR_RASTOUT: - reg_idx = reg->idx[0].offset; + reg_idx = SM1_RASTOUT_REGISTER_OFFSET + reg->idx[0].offset; signature = normaliser->output_signature; reg->type = VKD3DSPR_OUTPUT; dcl_params = normaliser->output_dcl_params; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 58bed96d..b9fd3cb1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -956,6 +956,7 @@ enum vkd3d_shader_input_sysval_semantic }; #define SM1_COLOR_REGISTER_OFFSET 8 +#define SM1_RASTOUT_REGISTER_OFFSET 10 #define SIGNATURE_TARGET_LOCATION_UNUSED (~0u) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 61c412c5..018506a4 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -523,11 +523,11 @@ static void test_scan_signatures(void) static const struct vkd3d_shader_signature_element vs3_outputs[] = { - {"POSITION", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, - {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, - {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 8, 0xf, 0xf}, - {"FOG", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1}, - {"PSIZE", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0x1, 0x1}, + {"POSITION", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 10, 0xf, 0xf}, + {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, + {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 8, 0xf, 0xf}, + {"FOG", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 11, 0x1, 0x1}, + {"PSIZE", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 12, 0x1, 0x1}, }; static const char vs4_source[] =

1 0

Gabriel Ivăncescu : winex11: Use the correct root window for virtual desktops.
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: wine Branch: master Commit: 790133e95036597092443b30c0fe0aa6a40a9167 URL: https://gitlab.winehq.org/wine/wine/-/commit/790133e95036597092443b30c0fe0a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 3 18:56:26 2024 +0200 winex11: Use the correct root window for virtual desktops. Fixes a regression introduced by 7255f63a6530f8b2daee03aadd178ef4141f30c2, which effectively made the taskbar always visible even when virtual desktop was supposed to be fullscreen. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 687c0cf5a4c..fcb6ba2faf5 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -107,7 +107,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) if (!display || !is_virtual_desktop()) return; xev.xclient.type = ClientMessage; - xev.xclient.window = root_window; + xev.xclient.window = DefaultRootWindow(display); xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); xev.xclient.serial = 0; xev.xclient.display = display;

1 0

Eric Pouech : quartz: Delay import ddraw.
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: wine Branch: master Commit: eed778467ab65fb306e1bf776947e2067739b536 URL: https://gitlab.winehq.org/wine/wine/-/commit/eed778467ab65fb306e1bf776947e2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Dec 28 09:50:01 2023 +0100 quartz: Delay import ddraw. So that ddraw isn't always loaded, esp. for app not requesting vmr7. Could lower memory pressure on 32bit. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index a1859dd58a5..1456d281cb8 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,7 @@ -MODULE = quartz.dll -IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid ddraw dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm +MODULE = quartz.dll +IMPORTLIB = quartz +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm +DELAYIMPORTS = ddraw SOURCES = \ acmwrapper.c \

1 0

Henri Verbeet : vkd3d: Add D3D_FEATURE_LEVEL_12_2 as a valid feature level.
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: vkd3d Branch: master Commit: 6abcc27c9746884d371ae136cfb2c11b7ff80fb8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6abcc27c9746884d371ae136cfb2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 15:46:28 2024 +0100 vkd3d: Add D3D_FEATURE_LEVEL_12_2 as a valid feature level. --- include/vkd3d_d3dcommon.idl | 1 + libs/vkd3d/utils.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index b7948609..b5a9d3cf 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -164,6 +164,7 @@ typedef enum D3D_FEATURE_LEVEL D3D_FEATURE_LEVEL_11_1 = 0xb100, D3D_FEATURE_LEVEL_12_0 = 0xc000, D3D_FEATURE_LEVEL_12_1 = 0xc100, + D3D_FEATURE_LEVEL_12_2 = 0xc200, } D3D_FEATURE_LEVEL; typedef enum D3D_CBUFFER_TYPE diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 9b28068b..0a50315a 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -539,6 +539,7 @@ bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) { static const D3D_FEATURE_LEVEL valid_feature_levels[] = { + D3D_FEATURE_LEVEL_12_2, D3D_FEATURE_LEVEL_12_1, D3D_FEATURE_LEVEL_12_0, D3D_FEATURE_LEVEL_11_1,

1 0

Henri Verbeet : vkd3d: Add D3D_FEATURE_LEVEL_1_0_CORE as a valid feature level.
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: vkd3d Branch: master Commit: 4ec7f360d9550be4fb09f5a81d215a17a419da3f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4ec7f360d9550be4fb09f5a81d215… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 15:48:01 2024 +0100 vkd3d: Add D3D_FEATURE_LEVEL_1_0_CORE as a valid feature level. --- include/vkd3d_d3dcommon.idl | 1 + libs/vkd3d/utils.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index b5a9d3cf..ab5dd01f 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -155,6 +155,7 @@ typedef enum D3D_PRIMITIVE_TOPOLOGY typedef enum D3D_FEATURE_LEVEL { + D3D_FEATURE_LEVEL_1_0_CORE = 0x1000, D3D_FEATURE_LEVEL_9_1 = 0x9100, D3D_FEATURE_LEVEL_9_2 = 0x9200, D3D_FEATURE_LEVEL_9_3 = 0x9300, diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 0a50315a..5ebe1b63 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -549,6 +549,7 @@ bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) D3D_FEATURE_LEVEL_9_3, D3D_FEATURE_LEVEL_9_2, D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_1_0_CORE, }; unsigned int i;

1 0

Conor McCarthy : vkd3d-shader/dxil: Count global variables in dxil_block_compute_module_decl_count().
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: vkd3d Branch: master Commit: 8aa6e2228e575f7491cc97529f81fc79b8957428 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8aa6e2228e575f7491cc97529f81f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 1 14:45:31 2023 +1000 vkd3d-shader/dxil: Count global variables in dxil_block_compute_module_decl_count(). --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 46f3b1d4..d129a411 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1237,7 +1237,7 @@ static size_t dxil_block_compute_module_decl_count(const struct dxil_block *bloc size_t i, count; for (i = 0, count = 0; i < block->record_count; ++i) - count += block->records[i]->code == MODULE_CODE_FUNCTION; + count += block->records[i]->code == MODULE_CODE_FUNCTION || block->records[i]->code == MODULE_CODE_GLOBALVAR; return count; }

1 0

Conor McCarthy : vkd3d-shader/dxil: Pre-allocate instruction space for globals in sm6_parser_globals_init().
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: vkd3d Branch: master Commit: 111818eabbb10aa9afe16ea8a4a6484e1a922d6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/111818eabbb10aa9afe16ea8a4a64… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 1 14:46:21 2023 +1000 vkd3d-shader/dxil: Pre-allocate instruction space for globals in sm6_parser_globals_init(). For simplicity, declaration handlers assume instruction allocation will not fail. --- libs/vkd3d-shader/dxil.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index d129a411..48cce466 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2877,8 +2877,8 @@ static const struct vkd3d_shader_immediate_constant_buffer *resolve_forward_init static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) { + size_t i, count, base_value_idx = sm6->value_count; const struct dxil_block *block = &sm6->root_block; - size_t i, base_value_idx = sm6->value_count; struct vkd3d_shader_instruction *ins; const struct dxil_record *record; enum vkd3d_result ret; @@ -2887,6 +2887,10 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) sm6->p.location.line = block->id; sm6->p.location.column = 0; + for (i = 0, count = 0; i < block->record_count; ++i) + count += block->records[i]->code == MODULE_CODE_GLOBALVAR; + sm6_parser_require_space(sm6, count); + for (i = 0; i < block->record_count; ++i) { sm6->p.location.column = i;

1 0

Giovanni Mascellani : vkd3d-shader/dxil: Do not use the parser before it is initialized.
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: vkd3d Branch: master Commit: a02cd1cf6433c92eac92708e82b333d28877437e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a02cd1cf6433c92eac92708e82b33… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Dec 15 14:07:21 2023 +0100 vkd3d-shader/dxil: Do not use the parser before it is initialized. --- libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 48cce466..36103246 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6035,7 +6035,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if ((magic = sm6->start[0]) != BITCODE_MAGIC) { WARN("Unknown magic number 0x%08x.\n", magic); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER, + vkd3d_shader_warning(message_context, &location, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER, "DXIL bitcode chunk magic number 0x%08x is not the expected 0x%08x.", magic, BITCODE_MAGIC); } @@ -6044,7 +6044,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if ((version.type = version_token >> 16) >= VKD3D_SHADER_TYPE_COUNT) { FIXME("Unknown shader type %#x.\n", version.type); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE, + vkd3d_shader_warning(message_context, &location, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE, "Unknown shader type %#x.", version.type); } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index de7a66e0..f12b11ad 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -307,6 +307,16 @@ void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const s vkd3d_string_buffer_printf(&context->messages, "\n"); } +void vkd3d_shader_warning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_vwarning(context, location, error, format, args); + va_end(args); +} + void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 97de7cc0..0199d710 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1398,6 +1398,8 @@ void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const str enum vkd3d_shader_error error, const char *format, va_list args); void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_log_level level, const char *format, va_list args); +void vkd3d_shader_warning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5); void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args);

1 0

Giovanni Mascellani : vkd3d-shader/dxil: Use vkd3d_shader_parser_error() for error reporting when available.
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: vkd3d Branch: master Commit: 3bafee344d8d50172d8da18512ba070c6826b18d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3bafee344d8d50172d8da18512ba0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Dec 15 14:13:55 2023 +0100 vkd3d-shader/dxil: Use vkd3d_shader_parser_error() for error reporting when available. --- libs/vkd3d-shader/dxil.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 36103246..2424b176 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6070,10 +6070,10 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if ((ret = dxil_block_init(block, NULL, sm6)) < 0) { if (ret == VKD3D_ERROR_OUT_OF_MEMORY) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory parsing DXIL bitcode chunk."); else if (ret == VKD3D_ERROR_INVALID_SHADER) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_INVALID_BITCODE, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_BITCODE, "DXIL bitcode chunk has invalid bitcode."); else vkd3d_unreachable(); @@ -6103,10 +6103,10 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if ((ret = sm6_parser_type_table_init(sm6)) < 0) { if (ret == VKD3D_ERROR_OUT_OF_MEMORY) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory parsing DXIL type table."); else if (ret == VKD3D_ERROR_INVALID_SHADER) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_INVALID_TYPE_TABLE, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_TYPE_TABLE, "DXIL type table is invalid."); else vkd3d_unreachable(); @@ -6116,10 +6116,10 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if ((ret = sm6_parser_symtab_init(sm6)) < 0) { if (ret == VKD3D_ERROR_OUT_OF_MEMORY) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory parsing DXIL value symbol table."); else if (ret == VKD3D_ERROR_INVALID_SHADER) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_INVALID_VALUE_SYMTAB, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_VALUE_SYMTAB, "DXIL value symbol table is invalid."); else vkd3d_unreachable(); @@ -6130,7 +6130,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t || !(sm6->input_params = shader_parser_get_dst_params(&sm6->p, input_signature->element_count))) { ERR("Failed to allocate input/output parameters.\n"); - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory allocating input/output parameters."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -6139,7 +6139,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if (!(sm6->functions = vkd3d_calloc(function_count, sizeof(*sm6->functions)))) { ERR("Failed to allocate function array.\n"); - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory allocating DXIL function array."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -6147,14 +6147,14 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if (sm6_parser_compute_max_value_count(sm6, &sm6->root_block, 0) == SIZE_MAX) { WARN("Value array count overflowed.\n"); - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE, "Overflow occurred in the DXIL module value count."); return VKD3D_ERROR_INVALID_SHADER; } if (!(sm6->values = vkd3d_calloc(sm6->value_capacity, sizeof(*sm6->values)))) { ERR("Failed to allocate value array.\n"); - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory allocating DXIL value array."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -6181,7 +6181,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if (j == ARRAY_SIZE(sm6->metadata_tables)) { FIXME("Too many metadata tables.\n"); - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_INVALID_METADATA, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_METADATA, "A metadata table count greater than %zu is unsupported.", ARRAY_SIZE(sm6->metadata_tables)); return VKD3D_ERROR_INVALID_SHADER; } @@ -6199,17 +6199,17 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if ((ret = sm6_parser_module_init(sm6, &sm6->root_block, 0)) < 0) { if (ret == VKD3D_ERROR_OUT_OF_MEMORY) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory parsing DXIL module."); else if (ret == VKD3D_ERROR_INVALID_SHADER) - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE, "DXIL module is invalid."); return ret; } if (!sm6_parser_require_space(sm6, output_signature->element_count + input_signature->element_count)) { - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory emitting shader signature declarations."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -6227,7 +6227,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t assert(sm6->function_count == 1); if (!sm6_block_emit_instructions(fn->blocks[0], sm6)) { - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, "Out of memory emitting shader instructions."); return VKD3D_ERROR_OUT_OF_MEMORY; }

1 0

Alexandre Julliard : readme: Convert to Markdown.
by Alexandre Julliard 03 Jan '24

03 Jan '24

Module: wine Branch: master Commit: 158e9e7636486062113256f2b961785363fb28c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/158e9e7636486062113256f2b96178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 3 12:05:10 2024 +0100 readme: Convert to Markdown. --- README => README.md | 93 ++++++++-------- documentation/{README.de => README-de.md} | 100 ++++++++--------- documentation/{README.es => README-es.md} | 103 ++++++++--------- documentation/{README.fi => README-fi.md} | 94 ++++++++-------- documentation/{README.fr => README-fr.md} | 101 ++++++++--------- documentation/{README.hu => README-hu.md} | 141 ++++++++---------------- documentation/{README.it => README-it.md} | 102 ++++++++--------- documentation/{README.ja => README-ja.md} | 113 +++++++++---------- documentation/{README.ko => README-ko.md} | 108 ++++++++---------- documentation/{README.nl => README-nl.md} | 102 +++++++++-------- documentation/{README.no => README-no.md} | 103 ++++++++--------- documentation/{README.pt => README-pt.md} | 127 ++++++++------------- documentation/{README.pt_br => README-pt_br.md} | 112 ++++++++----------- documentation/{README.ru => README-ru.md} | 98 ++++++++-------- documentation/{README.sv => README-sv.md} | 107 ++++++++---------- documentation/{README.tr => README-tr.md} | 113 +++++++++---------- documentation/{README.uk => README-uk.md} | 107 ++++++++---------- documentation/{README.zh_cn => README-zh_cn.md} | 97 ++++++++-------- 18 files changed, 860 insertions(+), 1061 deletions(-)

1 0