wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Huw Davies : wineoss: Move get_render_buffer to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 7a5a2db11ff7c1c857f07cd4362c4ec25897702b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5a2db11ff7c1c857f07cd4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:55 2022 +0100 wineoss: Move get_render_buffer to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 55 +++++---------------------------------------- dlls/wineoss.drv/oss.c | 49 ++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++++ 3 files changed, 64 insertions(+), 49 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 921253b62c2..491e4fc5d16 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1251,9 +1251,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct oss_stream *stream = This->stream; - UINT32 write_pos; - SIZE_T size; + struct get_render_buffer_params params; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1262,53 +1260,12 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = NULL; - oss_lock(stream); - - if(stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(!frames){ - oss_unlock(stream); - return S_OK; - } - - if(stream->held_frames + frames > stream->bufsize_frames){ - oss_unlock(stream); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - write_pos = - (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; - if(write_pos + frames > stream->bufsize_frames){ - if(stream->tmp_buffer_frames < frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - oss_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = frames; - } - *data = stream->tmp_buffer; - stream->getbuf_last = -frames; - }else{ - *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; - stream->getbuf_last = frames; - } - - silence_buffer(stream, *data, frames); - - oss_unlock(stream); + params.stream = This->stream; + params.frames = frames; + params.data = data; + OSS_CALL(get_render_buffer, &params); - return S_OK; + return params.result; } static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 written_frames) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 3ea0ab42e3e..9c45aa082b4 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -876,6 +876,54 @@ static NTSTATUS timer_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_render_buffer(void *args) +{ + struct get_render_buffer_params *params = args; + struct oss_stream *stream = params->stream; + UINT32 write_pos, frames = params->frames; + BYTE **data = params->data; + SIZE_T size; + + oss_lock(stream); + + if(stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(!frames) + return oss_unlock_result(stream, &params->result, S_OK); + + if(stream->held_frames + frames > stream->bufsize_frames) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_TOO_LARGE); + + write_pos = + (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; + if(write_pos + frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = frames; + } + *data = stream->tmp_buffer; + stream->getbuf_last = -frames; + }else{ + *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; + stream->getbuf_last = frames; + } + + silence_buffer(stream, *data, frames); + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1073,6 +1121,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = stop, reset, timer_loop, + get_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 73963b1871b..0d83a03d64f 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -113,6 +113,14 @@ struct timer_loop_params struct oss_stream *stream; }; +struct get_render_buffer_params +{ + struct oss_stream *stream; + UINT32 frames; + HRESULT result; + BYTE **data; +}; + struct is_format_supported_params { const char *device; @@ -169,6 +177,7 @@ enum oss_funcs oss_stop, oss_reset, oss_timer_loop, + oss_get_render_buffer, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size,

1 0

Huw Davies : wineoss: Move set_event_handle to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 9ced8cc9239dfadfbf4323dcdfcc292f4f5450c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ced8cc9239dfadfbf4323dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:54 2022 +0100 wineoss: Move set_event_handle to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 23 +++++------------------ dlls/wineoss.drv/oss.c | 21 +++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 77548045702..921253b62c2 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -994,7 +994,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct set_event_handle_params params; TRACE("(%p)->(%p)\n", This, event); @@ -1004,24 +1004,11 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - oss_unlock(stream); - return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - } - - if (stream->event){ - oss_unlock(stream); - FIXME("called twice\n"); - return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - } - - stream->event = event; - - oss_unlock(stream); + params.stream = This->stream; + params.event = event; + OSS_CALL(set_event_handle, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 72e917dfd76..3ea0ab42e3e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1043,6 +1043,26 @@ static NTSTATUS get_current_padding(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_event_handle(void *args) +{ + struct set_event_handle_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED); + + if (stream->event){ + FIXME("called twice\n"); + return oss_unlock_result(stream, &params->result, HRESULT_FROM_WIN32(ERROR_INVALID_NAME)); + } + + stream->event = params->event; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1058,4 +1078,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + set_event_handle, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index bd4b065c61e..73963b1871b 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -152,6 +152,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct set_event_handle_params +{ + struct oss_stream *stream; + HANDLE event; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, @@ -167,6 +174,7 @@ enum oss_funcs oss_get_buffer_size, oss_get_latency, oss_get_current_padding, + oss_set_event_handle, }; extern unixlib_handle_t oss_handle;

1 0

Ziqing Hui : d2d1: Implement SetUnitMode().
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: c634bd201b5e561c34b86687159e75db5fbc6414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c634bd201b5e561c34b86687… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 15 11:31:51 2022 +0800 d2d1: Implement SetUnitMode(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 12 +++++++++++- dlls/d2d1/tests/d2d1.c | 5 ++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 7bf4d6e1577..13c99458cfa 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2149,7 +2149,17 @@ static D2D1_PRIMITIVE_BLEND STDMETHODCALLTYPE d2d_device_context_GetPrimitiveBle static void STDMETHODCALLTYPE d2d_device_context_SetUnitMode(ID2D1DeviceContext *iface, D2D1_UNIT_MODE unit_mode) { - FIXME("iface %p, unit_mode %#x stub!\n", iface, unit_mode); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p, unit_mode %#x.\n", iface, unit_mode); + + if (unit_mode != D2D1_UNIT_MODE_DIPS && unit_mode != D2D1_UNIT_MODE_PIXELS) + { + WARN("Unknown unit mode %#x.\n", unit_mode); + return; + } + + context->drawing_state.unitMode = unit_mode; } static D2D1_UNIT_MODE STDMETHODCALLTYPE d2d_device_context_GetUnitMode(ID2D1DeviceContext *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9937d9d4a82..ca80a8e946b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9606,11 +9606,11 @@ static void test_unit_mode(BOOL d3d11) ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); unit_mode = ID2D1DeviceContext_GetUnitMode(context); - todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); ID2D1DeviceContext_SetUnitMode(context, 0xdeadbeef); unit_mode = ID2D1DeviceContext_GetUnitMode(context); - todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); ID2D1DeviceContext_Release(context); release_test_context(&ctx); @@ -10874,7 +10874,6 @@ static void test_image_bounds(BOOL d3d11) ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); - todo_wine_if(!compare_float(test->dpi_x, 96.0f, 0) || !compare_float(test->dpi_y, 96.0f, 0)) ok(compare_rect(&bounds, 0.0f, 0.0f, test->pixel_size.width, test->pixel_size.height, 0), "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f,

1 0

Ziqing Hui : d2d1: Implement GetUnitMode().
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: eeed1bb541845a5132fa64a37e922be34cdfc177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeed1bb541845a5132fa64a3… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 15 11:31:50 2022 +0800 d2d1: Implement GetUnitMode(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 43c65ebddc1..7bf4d6e1577 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2154,9 +2154,11 @@ static void STDMETHODCALLTYPE d2d_device_context_SetUnitMode(ID2D1DeviceContext static D2D1_UNIT_MODE STDMETHODCALLTYPE d2d_device_context_GetUnitMode(ID2D1DeviceContext *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p.\n", iface); - return D2D1_UNIT_MODE_DIPS; + return context->drawing_state.unitMode; } static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawGlyphRun(ID2D1DeviceContext *iface,

1 0

Francois Gouget : testbot/cgi: Fix FormPage's OnAction() error handling.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: tools Branch: master Commit: e3c7c82506242f0da18ea85206001ea1684bf767 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e3c7c82506242f0da18ea85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 15 11:44:08 2022 +0200 testbot/cgi: Fix FormPage's OnAction() error handling. Form pages obviously don't have an enclosing page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c419244..4f29efe 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -681,7 +681,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - $self->{EnclosingPage}->SetError(undef, "No action defined for $Action"); + $self->SetError(undef, "No action defined for $Action"); return 0; }

1 0

Giovanni Mascellani : tests: Add another vector indexing test.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 16da0b33000b1af81161991e99f37983eb5c06f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16da0b33000b1af81161991… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:42 2022 +0200 tests: Add another vector indexing test. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-vector-indexing.shader_test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test index f46377cf..1c964147 100644 --- a/tests/hlsl-vector-indexing.shader_test +++ b/tests/hlsl-vector-indexing.shader_test @@ -12,3 +12,16 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (0.02, 0.245, 0.351, 1.0) + +[pixel shader] +uniform float4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0], m[1], m[1], m[2]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo draw quad +probe all rgba (1.0, 2.0, 2.0, 3.0)

1 0

Giovanni Mascellani : tests: Test matrix indexing.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 564883a201f4bec05ff666f88f4766326f85c589 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=564883a201f4bec05ff666f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:41 2022 +0200 tests: Test matrix indexing. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/hlsl-matrix-indexing.shader_test | 47 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/Makefile.am b/Makefile.am index d57ea2b7..ed881ffa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,6 +85,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-matrix-indexing.shader_test \ tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test new file mode 100644 index 00000000..1d444ffa --- /dev/null +++ b/tests/hlsl-matrix-indexing.shader_test @@ -0,0 +1,47 @@ +[pixel shader] +uniform float4x4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0][0], m[1][0], m[1][2], m[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 2.0, 10.0, 15.0) + +[pixel shader] +uniform column_major float4x4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0][0], m[1][0], m[1][2], m[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 2.0, 10.0, 15.0) + +[pixel shader] +uniform row_major float4x4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0][0], m[1][0], m[1][2], m[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 5.0, 7.0, 12.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant modulus.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 2b23b7329c484d1b6c0bb37cbefe5b564283b06e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b23b7329c484d1b6c0bb37… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:40 2022 +0200 vkd3d-shader/hlsl: Fold constant modulus. This commit includes work by Francisco Casas. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 48 +++++++++++++++++++++++++++++++++++ tests/arithmetic-int.shader_test | 11 +++++++- tests/arithmetic-uint.shader_test | 9 +++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9a8bc6b0..06b957ba 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -318,6 +318,50 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + if (src2->value[k].i == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + if (src1->value[k].i == INT_MIN && src2->value[k].i == -1) + dst->value[k].i = 0; + else + dst->value[k].i = src1->value[k].i % src2->value[k].i; + break; + + case HLSL_TYPE_UINT: + if (src2->value[k].u == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + dst->value[k].u = src1->value[k].u % src2->value[k].u; + break; + + default: + FIXME("Fold modulus for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -375,6 +419,10 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void success = fold_div(ctx, res, arg1, arg2); break; + case HLSL_OP2_MOD: + success = fold_mod(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index c85b9a3a..c2eee2ba 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -21,7 +21,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [pixel shader fail] @@ -32,3 +32,12 @@ float4 main() : SV_TARGET return x / y; } + +[pixel shader fail] +float4 main() : SV_TARGET +{ + int x = 1; + int y = 0; + + return x % y; +} diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test index f37c881e..f1801b9c 100644 --- a/tests/arithmetic-uint.shader_test +++ b/tests/arithmetic-uint.shader_test @@ -35,3 +35,12 @@ float4 main() : SV_TARGET return x / y; } + +[pixel shader fail] +float4 main() : SV_TARGET +{ + uint x = 1; + uint y = 0; + + return x % y; +}

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant division.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 40b299c7276d03b1abe833649a942c74a8f9f4ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=40b299c7276d03b1abe8336… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:39 2022 +0200 vkd3d-shader/hlsl: Fold constant division. This commit includes work by Francisco Casas. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 67 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/arithmetic-float.shader_test | 16 ++++++++ tests/arithmetic-int.shader_test | 11 +++++- tests/arithmetic-uint.shader_test | 9 +++++ 5 files changed, 104 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 5cac4bde..9a8bc6b0 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -255,6 +255,69 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + if (src2->value[k].f == 0) + { + hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + "Floating point division by zero"); + } + dst->value[k].f = src1->value[k].f / src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + if (src2->value[k].d == 0) + { + hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + "Floating point division by zero"); + } + dst->value[k].d = src1->value[k].d / src2->value[k].d; + break; + + case HLSL_TYPE_INT: + if (src2->value[k].i == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + if (src1->value[k].i == INT_MIN && src2->value[k].i == -1) + dst->value[k].i = INT_MIN; + else + dst->value[k].i = src1->value[k].i / src2->value[k].i; + break; + + case HLSL_TYPE_UINT: + if (src2->value[k].u == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + dst->value[k].u = src1->value[k].u / src2->value[k].u; + break; + + default: + FIXME("Fold division for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -308,6 +371,10 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void success = fold_nequal(ctx, res, arg1, arg2); break; + case HLSL_OP2_DIV: + success = fold_div(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 21f23709..29e178cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -117,8 +117,10 @@ enum vkd3d_shader_error 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_ERROR_HLSL_DIVISION_BY_ZERO = 5021, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, + VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index d55dc9d4..f99b9728 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -23,3 +23,19 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[require] +shader model >= 4.0 + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 1; + float y = 0; + + return x / y; +} + +[test] +draw quad +probe all rgba (1e99, 1e99, 1e99, 1e99) diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index 5d9cc029..c85b9a3a 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (20.0, -10.0, 75.0, 0.0) [pixel shader] @@ -23,3 +23,12 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader fail] +float4 main() : SV_TARGET +{ + int x = 1; + int y = 0; + + return x / y; +} diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test index b016dbb6..f37c881e 100644 --- a/tests/arithmetic-uint.shader_test +++ b/tests/arithmetic-uint.shader_test @@ -26,3 +26,12 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (5.0, 5.0, 4294967296.0, 3.0) + +[pixel shader fail] +float4 main() : SV_TARGET +{ + uint x = 1; + uint y = 0; + + return x / y; +}

1 0

Francisco Casas : vkd3d-shader/hlsl: Support complex numeric initializers.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: aefadb87b67f78ca88fbd993f0b1dd6cae91ec49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aefadb87b67f78ca88fbd99… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 14 12:52:38 2022 +0200 vkd3d-shader/hlsl: Support complex numeric initializers. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 47 +++++++++++++++++++++++++++--- tests/hlsl-initializer-flatten.shader_test | 4 +-- tests/hlsl-initializer-nested.shader_test | 2 +- tests/hlsl-initializer-numeric.shader_test | 8 ++--- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f0a74826..58d71ff6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1447,6 +1447,39 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } +static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_offset) +{ + unsigned int i; + + if (type->type == HLSL_CLASS_MATRIX) + hlsl_fixme(ctx, &var->loc, "Matrix initializer."); + + for (i = 0; i < type->dimx; i++) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *node; + + node = initializer->args[*initializer_offset]; + *initializer_offset += 1; + + if (!(node = add_implicit_conversion(ctx, initializer->instrs, node, + hlsl_get_scalar_type(ctx, type->base_type), &node->loc))) + return; + + if (!(c = hlsl_new_uint_constant(ctx, reg_offset + i, &node->loc))) + return; + list_add_tail(initializer->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) + return; + + list_add_tail(initializer->instrs, &store->node.entry); + } +} + static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -1612,6 +1645,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.braces) { unsigned int size = initializer_size(&v->initializer); + unsigned int initializer_offset = 0; if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) { @@ -1647,10 +1681,15 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; + if (v->initializer.args_count != size) + { + hlsl_fixme(ctx, &v->loc, "Flatten initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + initialize_numeric_var(ctx, var, &v->initializer, 0, type, &initializer_offset); } } else diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl-initializer-flatten.shader_test index 439ead5e..3a430e0d 100644 --- a/tests/hlsl-initializer-flatten.shader_test +++ b/tests/hlsl-initializer-flatten.shader_test @@ -37,8 +37,8 @@ float4 main() : sv_target } [test] -todo draw quad -probe all rgba (40, 10, 20, 30) +draw quad +todo probe all rgba (40, 10, 20, 30) [pixel shader] diff --git a/tests/hlsl-initializer-nested.shader_test b/tests/hlsl-initializer-nested.shader_test index 0204afc9..bcb37cf4 100644 --- a/tests/hlsl-initializer-nested.shader_test +++ b/tests/hlsl-initializer-nested.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1, 2, 3, 4) diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test index 92117591..40576887 100644 --- a/tests/hlsl-initializer-numeric.shader_test +++ b/tests/hlsl-initializer-numeric.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -18,7 +18,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -31,7 +31,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -44,5 +44,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.1, 1.1, 1.2, 2.1) 4

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022