February 2023 - Wine-commits

Rémi Bernon : joy.cpl: Refresh the DInput button display on device change.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 91f7201d421cc655bfa66fe89248055875a26358 URL: https://gitlab.winehq.org/wine/wine/-/commit/91f7201d421cc655bfa66fe8924805… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 6 11:54:13 2023 +0100 joy.cpl: Refresh the DInput button display on device change. --- dlls/joy.cpl/dinput.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/joy.cpl/dinput.c b/dlls/joy.cpl/dinput.c index 9a6359834ea..188c430618d 100644 --- a/dlls/joy.cpl/dinput.c +++ b/dlls/joy.cpl/dinput.c @@ -564,6 +564,7 @@ LRESULT CALLBACK test_di_buttons_window_proc( HWND hwnd, UINT msg, WPARAM wparam hdc = BeginPaint( hwnd, &paint ); GetClientRect( hwnd, &rect ); + FillRect( hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1) ); size = (rect.right - rect.left - space) / step; offs = (rect.right - rect.left - step * size - space) / 2; @@ -762,6 +763,8 @@ INT_PTR CALLBACK test_di_dialog_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM SendDlgItemMessageW( hwnd, IDC_DI_EFFECTS, LB_SETCURSEL, 0, 0 ); handle_di_effects_change( hwnd ); + + update_device_views( hwnd ); break; case MAKEWPARAM( IDC_DI_EFFECTS, LBN_SELCHANGE ):

1 0

Rémi Bernon : joy.cpl: Improve the DInput button display with many buttons.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: bb9ee1e94a3e3e8423df2f5a0613c5d7b4d8cdae URL: https://gitlab.winehq.org/wine/wine/-/commit/bb9ee1e94a3e3e8423df2f5a0613c5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 6 11:54:38 2023 +0100 joy.cpl: Improve the DInput button display with many buttons. --- dlls/joy.cpl/dinput.c | 10 ++++++---- dlls/joy.cpl/joy.rc | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/joy.cpl/dinput.c b/dlls/joy.cpl/dinput.c index 188c430618d..a4aef66e04d 100644 --- a/dlls/joy.cpl/dinput.c +++ b/dlls/joy.cpl/dinput.c @@ -417,7 +417,8 @@ static void draw_button_view( HDC hdc, RECT rect, BOOL set, const WCHAR *name ) SelectObject( hdc, GetStockObject( DC_BRUSH ) ); SelectObject( hdc, GetStockObject( DC_PEN ) ); - Ellipse( hdc, rect.left, rect.top, rect.right, rect.bottom ); + if (rect.right - rect.left < 16) Rectangle( hdc, rect.left, rect.top, rect.right, rect.bottom ); + else Ellipse( hdc, rect.left, rect.top, rect.right, rect.bottom ); color = SetTextColor( hdc, GetSysColor( set ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT ) ); font = SelectObject( hdc, GetStockObject( ANSI_VAR_FONT ) ); @@ -559,7 +560,7 @@ LRESULT CALLBACK test_di_buttons_window_proc( HWND hwnd, UINT msg, WPARAM wparam } if (caps.dwButtons <= 48) step = 16; - else step = 32; + else step = 24; hdc = BeginPaint( hwnd, &paint ); @@ -579,7 +580,8 @@ LRESULT CALLBACK test_di_buttons_window_proc( HWND hwnd, UINT msg, WPARAM wparam for (j = 0; j < step && i < caps.dwButtons; j++, i++) { WCHAR buffer[3]; - swprintf( buffer, ARRAY_SIZE(buffer), L"%d", i ); + if (step == 24) swprintf( buffer, ARRAY_SIZE(buffer), L"%02x", i ); + else swprintf( buffer, ARRAY_SIZE(buffer), L"%d", i ); draw_button_view( hdc, rect, state.rgbButtons[i], buffer ); OffsetRect( &rect, size, 0 ); } @@ -675,7 +677,7 @@ static void create_device_views( HWND hwnd ) GetClientRect( parent, &rect ); rect.top += 10; - margin = (rect.bottom - rect.top) * 10 / 100; + margin = (rect.bottom - rect.top) * 5 / 100; InflateRect( &rect, -margin, -margin ); CreateWindowW( L"JoyCplDInputButtons", NULL, WS_CHILD | WS_VISIBLE, rect.left, rect.top, diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 08f6fa12e0c..76d8bb401e4 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -57,9 +57,9 @@ FONT 8, "Ms Shell Dlg" COMBOBOX IDC_DI_DEVICES, 15, 10, 291, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS GROUPBOX "Axes", IDC_DI_AXES, 15, 30, 214, 60 GROUPBOX "POVs", IDC_DI_POVS, 246, 30, 60, 60 - GROUPBOX "Buttons", IDC_DI_BUTTONS, 15, 100, 291, 70 - LTEXT "Force Feedback Effect", IDC_STATIC, 15, 180, 291, 10 - LISTBOX IDC_DI_EFFECTS, 15, 190, 291, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + GROUPBOX "Buttons", IDC_DI_BUTTONS, 15, 100, 291, 86 + LTEXT "Force Feedback Effect", IDC_STATIC, 15, 196, 291, 10 + LISTBOX IDC_DI_EFFECTS, 15, 206, 291, 54, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY LTEXT "Press any button in the controller to activate the chosen effect. The effect direction can be changed with the controller axis.", IDC_STATIC, 15, 260, 291, 25 }

1 0

Rémi Bernon : joy.cpl: Use the DIJOYSTATE2 user data format to support more buttons.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: b4b6c3af7534e0503b147613badf5de9c093c1cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b4b6c3af7534e0503b147613badf5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 6 11:55:00 2023 +0100 joy.cpl: Use the DIJOYSTATE2 user data format to support more buttons. --- dlls/joy.cpl/dinput.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/joy.cpl/dinput.c b/dlls/joy.cpl/dinput.c index a4aef66e04d..f624e650147 100644 --- a/dlls/joy.cpl/dinput.c +++ b/dlls/joy.cpl/dinput.c @@ -236,7 +236,7 @@ static BOOL CALLBACK enum_devices( const DIDEVICEINSTANCEW *instance, void *cont if (!(entry = calloc( 1, sizeof(*entry) ))) return DIENUM_STOP; IDirectInput8_CreateDevice( dinput, &instance->guidInstance, &entry->device, NULL ); - IDirectInputDevice8_SetDataFormat( entry->device, &c_dfDIJoystick ); + IDirectInputDevice8_SetDataFormat( entry->device, &c_dfDIJoystick2 ); IDirectInputDevice8_GetCapabilities( entry->device, &caps ); list_add_tail( &devices, &entry->entry ); @@ -266,7 +266,7 @@ static DWORD WINAPI input_thread( void *param ) while (WaitForMultipleObjects( 2, events, FALSE, INFINITE ) != 0) { IDirectInputEffect *effect; - DIJOYSTATE state = {0}; + DIJOYSTATE2 state = {0}; unsigned int i; SendMessageW( dialog_hwnd, WM_USER, 0, 0 ); @@ -437,7 +437,7 @@ LRESULT CALLBACK test_di_axes_window_proc( HWND hwnd, UINT msg, WPARAM wparam, L { DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; IDirectInputDevice8W *device; - DIJOYSTATE state = {0}; + DIJOYSTATE2 state = {0}; RECT rect, tmp_rect; PAINTSTRUCT paint; HDC hdc; @@ -503,7 +503,7 @@ LRESULT CALLBACK test_di_povs_window_proc( HWND hwnd, UINT msg, WPARAM wparam, L { DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; IDirectInputDevice8W *device; - DIJOYSTATE state = {0}; + DIJOYSTATE2 state = {0}; PAINTSTRUCT paint; RECT rect; HDC hdc; @@ -547,7 +547,7 @@ LRESULT CALLBACK test_di_buttons_window_proc( HWND hwnd, UINT msg, WPARAM wparam DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; UINT i, j, offs, size, step, space = 2; IDirectInputDevice8W *device; - DIJOYSTATE state = {0}; + DIJOYSTATE2 state = {0}; PAINTSTRUCT paint; RECT rect; HDC hdc;

1 0

Alex Henrie : winspool: Remove unnecessary call to RtlInitUnicodeString from add_printer_driver.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 69ea31ffb594eadb2b35c3f713d89f5488ee86f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/69ea31ffb594eadb2b35c3f713d89f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:35:29 2023 -0700 winspool: Remove unnecessary call to RtlInitUnicodeString from add_printer_driver. --- dlls/winspool.drv/info.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9ce3125787f..61017104ab1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -642,7 +642,6 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) WCHAR raw[] = L"RAW", driver_nt[] = L"wineps.drv"; if (!ppd) return FALSE; - RtlInitUnicodeString( &nt_ppd, NULL ); if (!RtlDosPathNameToNtPathName_U( ppd, &nt_ppd, NULL, NULL )) goto end; ppd_params.printer = name;

1 0

Rémi Bernon : winebuild: Use .incbin instead of printf for resource data.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 0b3f90ab1485d5bd32bd72d41c7fd8213b3b95b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b3f90ab1485d5bd32bd72d41c7fd8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 11 11:05:22 2023 +0100 winebuild: Use .incbin instead of printf for resource data. --- tools/winebuild/res32.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 1299730fe62..676693e178d 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -44,6 +44,8 @@ struct resource { struct string_id type; struct string_id name; + const char *input_name; + unsigned int input_offset; const void *data; unsigned int data_size; unsigned int data_offset; @@ -156,28 +158,6 @@ static void put_string( const struct string_id *str ) } } -static void dump_res_data( const struct resource *res ) -{ - unsigned int i = 0; - unsigned int size = (res->data_size + 3) & ~3; - - if (!size) return; - - input_buffer = res->data; - input_buffer_pos = 0; - input_buffer_size = size; - - output( "\t.long " ); - while (size > 4) - { - if ((i++ % 16) == 15) output( "0x%08x\n\t.long ", get_dword() ); - else output( "0x%08x,", get_dword() ); - size -= 4; - } - output( "0x%08x\n", get_dword() ); - assert( input_buffer_pos == input_buffer_size ); -} - /* check the file header */ /* all values must be zero except header size */ static int check_header(void) @@ -199,7 +179,7 @@ static int check_header(void) } /* load the next resource from the current file */ -static void load_next_resource( DLLSPEC *spec ) +static void load_next_resource( DLLSPEC *spec, const char *name ) { unsigned int hdr_size; struct resource *res = add_resource( spec ); @@ -209,6 +189,9 @@ static void load_next_resource( DLLSPEC *spec ) if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); + res->input_name = xstrdup( name ); + res->input_offset = input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; + res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; if ((const unsigned char *)res->data < input_buffer || (const unsigned char *)res->data >= input_buffer + input_buffer_size) @@ -237,7 +220,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) if ((ret = check_header())) { - while (input_buffer_pos < input_buffer_size) load_next_resource( spec ); + while (input_buffer_pos < input_buffer_size) load_next_resource( spec, name ); } return ret; } @@ -490,7 +473,7 @@ void output_resources( DLLSPEC *spec ) { output( "\n\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_res_%d:\n", i ); - dump_res_data( res ); + output( "\t.incbin \"%s\",%d,%d\n", res->input_name, res->input_offset, res->data_size ); } if (!is_pe())

1 0

Zebediah Figura : tests: Avoid performing a multi-component UAV load in uav-out-param.shader_test.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 09c5ed27fe2ea0da8c061b31ffcadc64321dbdee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09c5ed27fe2ea0da8c061b31ffcad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 7 17:04:14 2023 -0600 tests: Avoid performing a multi-component UAV load in uav-out-param.shader_test. It requires caps beyond shader model 5.0. --- tests/uav-out-param.shader_test | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/tests/uav-out-param.shader_test b/tests/uav-out-param.shader_test index 646d14f6..d7e29667 100644 --- a/tests/uav-out-param.shader_test +++ b/tests/uav-out-param.shader_test @@ -11,9 +11,12 @@ size (1, 1) RWTexture2D<float4> u; -void func(inout float4 f) +void func(out float4 f) { - f.xz += 0.1; + f.x = 0.1; + f.y = 0.2; + f.z = 0.3; + f.w = 0.4; } [numthreads(1, 1, 1)] @@ -24,4 +27,29 @@ void main() [test] todo dispatch 1 1 1 -todo probe uav 0 (0, 0) rgba (0.1, 0.3, 0.3, 0.5) +probe uav 0 (0, 0) rgba (0.4, 0.1, 0.2, 0.3) + +[uav 0] +format r32 float +size (1, 1) + +0.1 + +[compute shader todo] + +RWTexture2D<float> u; + +void func(inout float f) +{ + f += 0.1; +} + + [numthreads(1, 1, 1)] +void main() +{ + func(u[uint2(0, 0)]); +} + +[test] +todo dispatch 1 1 1 +probe uav 0 (0, 0) r (0.2)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Skip functions that don't have a body when looking for the entry point.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: bb41c3b5fe4fb3cea67afda5bf93b2eebe3f76d6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bb41c3b5fe4fb3cea67afda5bf93b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 18:18:50 2021 -0500 vkd3d-shader/hlsl: Skip functions that don't have a body when looking for the entry point. --- libs/vkd3d-shader/hlsl.c | 24 ++++++++++++++++++++---- libs/vkd3d-shader/hlsl.h | 2 +- tests/hlsl-invalid.shader_test | 4 ++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 19e294f9..1f21f043 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -554,9 +554,13 @@ struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool return NULL; } -bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) +struct hlsl_ir_function *hlsl_get_function(struct hlsl_ctx *ctx, const char *name) { - return rb_get(&ctx->functions, name) != NULL; + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->functions, name))) + return RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + return NULL; } struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) @@ -2628,8 +2632,9 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d 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; + struct hlsl_ir_function_decl *decl, *entry_func = NULL; const struct hlsl_profile_info *profile; + struct hlsl_ir_function *func; const char *entry_point; struct hlsl_ctx ctx; int ret; @@ -2685,7 +2690,18 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_NOT_IMPLEMENTED; } - if (!(entry_func = hlsl_get_func_decl(&ctx, entry_point))) + if ((func = hlsl_get_function(&ctx, entry_point))) + { + RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + { + if (!decl->has_body) + continue; + entry_func = decl; + break; + } + } + + if (!entry_func) { const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 567e3ad3..d615ff8a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -988,7 +988,7 @@ void hlsl_free_instr_list(struct list *list); void hlsl_free_type(struct hlsl_type *type); void hlsl_free_var(struct hlsl_ir_var *decl); -bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name); +struct hlsl_ir_function *hlsl_get_function(struct hlsl_ctx *ctx, const char *name); struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name); struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive); struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 1b39d7f0..e56205cb 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -264,3 +264,7 @@ float4 main() : sv_target { return 1.0; } + +[pixel shader fail] + +float4 main() : sv_target;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Emit a hlsl_fixme() if multiple valid entry point definitions are given.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 0cf39f3c63472e34968f71e4f4aacd7448f55231 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0cf39f3c63472e34968f71e4f4aac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 9 14:36:58 2023 -0600 vkd3d-shader/hlsl: Emit a hlsl_fixme() if multiple valid entry point definitions are given. --- libs/vkd3d-shader/hlsl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1f21f043..3656d05d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2696,8 +2696,13 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d { if (!decl->has_body) continue; + if (entry_func) + { + /* Depending on d3dcompiler version, either the first or last is + * selected. */ + hlsl_fixme(&ctx, &decl->loc, "Multiple valid entry point definitions."); + } entry_func = decl; - break; } }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lower return statements.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 8bdee6681bcfd6ca2830c543b990c784303607b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8bdee6681bcfd6ca2830c543b990c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 13 23:08:34 2021 -0500 vkd3d-shader/hlsl: Lower return statements. --- include/private/list.h | 24 +++++ libs/vkd3d-shader/hlsl.c | 14 +++ libs/vkd3d-shader/hlsl.h | 5 ++ libs/vkd3d-shader/hlsl_codegen.c | 186 +++++++++++++++++++++++++++++++++++++++ tests/return.shader_test | 14 +-- 5 files changed, 236 insertions(+), 7 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Emit a hlsl_fixme() for unhandled instruction types when writing bytecode.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 6177cea31fcdceaf2111f891dd2336442e4b9a40 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6177cea31fcdceaf2111f891dd233… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 9 15:26:04 2023 -0600 vkd3d-shader/hlsl: Emit a hlsl_fixme() for unhandled instruction types when writing bytecode. This was originally left alone in order to allow functions without early return to succeed, since in that case we would already emit the correct bytecode despite not handling the HLSL_IR_JUMP_RETURN instruction. Now that we lower return statements, however, any unhandled instructions are either definitely going to result in invalid bytecode, or rare enough that it's not worth returning success anyway. --- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 2 +- tests/return.shader_test | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 41b111a5..93e9fd8e 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -919,7 +919,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b break; default: - FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + hlsl_fixme(ctx, &instr->loc, "Instruction type %s.", hlsl_node_type_to_string(instr->type)); } } } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fb14889d..69f9b9d3 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2401,7 +2401,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * break; default: - FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + hlsl_fixme(ctx, &instr->loc, "Instruction type %s.", hlsl_node_type_to_string(instr->type)); } } } diff --git a/tests/return.shader_test b/tests/return.shader_test index 3847765e..a66d8756 100644 --- a/tests/return.shader_test +++ b/tests/return.shader_test @@ -146,7 +146,7 @@ void main(out float4 ret : sv_target) todo draw quad todo probe all rgba (0.2, 0.4, 0.6, 0.8) -[pixel shader] +[pixel shader todo] uniform float f; @@ -166,23 +166,23 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.0 -draw quad +todo draw quad todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1 uniform 0 float 0.1 -draw quad +todo draw quad todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1 uniform 0 float 0.3 -draw quad +todo draw quad todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 0 float 0.7 -draw quad +todo draw quad todo probe all rgba (0.8, 0.8, 0.8, 0.8) 1 uniform 0 float 0.9 -draw quad +todo draw quad todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1 [pixel shader todo]

1 0