wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Michael Stefaniuc : dmsynth: Remove superfluous casts to self.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: ad1ba07880a234b43089423c925b5179641bedf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad1ba07880a234b43089423c925b51… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:33:30 2023 +0100 dmsynth: Remove superfluous casts to self. --- dlls/dmsynth/synthsink.c | 2 +- dlls/dmsynth/tests/dmsynth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index d0a89358652..9263ff56349 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -320,7 +320,7 @@ static HRESULT synth_sink_activate(struct synth_sink *This) else { synth_sink_get_format(This, &format); - desc.lpwfxFormat = (WAVEFORMATEX *)&format; + desc.lpwfxFormat = &format; desc.dwBufferBytes = format.nAvgBytesPerSec; if (FAILED(hr = IDirectMusicSynthSink_GetDesiredBufferSize(iface, &desc.dwBufferBytes))) ERR("Failed to get desired buffer size, hr %#lx\n", hr); diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index ad09a651094..ad9f706aada 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -1134,11 +1134,11 @@ static void test_IDirectMusicSynth(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IReferenceClock_GetTime(latency_clock, &time); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, (BYTE **)&raw); + hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, &raw); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicBuffer_GetUsedBytes(buffer, &len); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicSynth_PlayBuffer(synth, time, (BYTE *)raw, len); + hr = IDirectMusicSynth_PlayBuffer(synth, time, raw, len); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicBuffer_Release(buffer); IReferenceClock_Release(latency_clock);

1 0

Michael Stefaniuc : dmime: Remove superfluous casts to self.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: b3382916c6b7d2fe2b338d7b84c1aff780179134 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3382916c6b7d2fe2b338d7b84c1af… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:31:51 2023 +0100 dmime: Remove superfluous casts to self. --- dlls/dmime/performance.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0a39e86ef96..f4504c4d36f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1545,7 +1545,7 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi IDirectSound_AddRef(*dsound); } if (dmusic && !*dmusic) { - *dmusic = (IDirectMusic *)This->dmusic; + *dmusic = This->dmusic; IDirectMusic_AddRef(*dmusic); } @@ -2117,7 +2117,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, msg->dwFlags &= ~DMUS_PMSGF_TOOL_IMMEDIATE; msg->dwFlags |= DMUS_PMSGF_TOOL_ATTIME; - if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg))) + if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, msg))) { ERR("Failed to send notification message, hr %#lx\n", hr); return DMUS_S_FREE;

1 0

Michael Stefaniuc : dmime/tests: Remove superfluous casts to self.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: e28388305746cf7c60ff04fb0d11f4e90a2ef707 URL: https://gitlab.winehq.org/wine/wine/-/commit/e28388305746cf7c60ff04fb0d11f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:31:03 2023 +0100 dmime/tests: Remove superfluous casts to self. --- dlls/dmime/tests/dmime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index bfb41d322e8..e1d88c11d62 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -2571,7 +2571,7 @@ static void test_performance_graph(void) /* performance exposes a graph interface but it's not an actual toolgraph */ hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == E_NOTIMPL, "got %#lx\n", hr); hr = IDirectMusicGraph_GetTool(graph, 0, &tmp_tool); ok(hr == E_NOTIMPL, "got %#lx\n", hr); @@ -2628,7 +2628,7 @@ static void test_performance_graph(void) ok(tmp_graph == graph, "got %p\n", graph); IDirectMusicGraph_Release(tmp_graph); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -2830,7 +2830,7 @@ static void test_performance_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -3111,7 +3111,7 @@ static void test_notification_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -3411,7 +3411,7 @@ static void test_wave_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -4286,7 +4286,7 @@ static void test_segment_state(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph);

1 0

Michael Stefaniuc : dmime: Remove redundant NULL check before free().
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: c3ef2e6efb2ebdd69e021b8518469a775c78c904 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ef2e6efb2ebdd69e021b8518469a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 8 19:27:56 2023 +0100 dmime: Remove redundant NULL check before free(). --- dlls/dmime/segment.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 126bc44335d..e806a845d37 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -112,10 +112,7 @@ static ULONG WINAPI segment_Release(IDirectMusicSegment8 *iface) list_remove(&entry->entry); track_entry_destroy(entry); } - - if (This->wave_data) - free(This->wave_data); - + free(This->wave_data); free(This); }

1 0

Brendan Shanks : ntdll: Don't use sysconf(_SC_PHYS_PAGES) on macOS.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: c6b2bccfe7b9687ffb9bab165e6edefb3e51243e URL: https://gitlab.winehq.org/wine/wine/-/commit/c6b2bccfe7b9687ffb9bab165e6ede… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 13 16:17:56 2023 -0800 ntdll: Don't use sysconf(_SC_PHYS_PAGES) on macOS. --- dlls/ntdll/unix/virtual.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 464f343a575..75e6319c007 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3329,6 +3329,15 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; info->MmHighestPhysicalPage = max(1, total / page_size); } +#elif defined(__APPLE__) + /* sysconf(_SC_PHYS_PAGES) is buggy on macOS: in a 32-bit process, it + * returns an error on Macs with >4GB of RAM. + */ + INT64 memsize; + size_t len = sizeof(memsize); + + if (!sysctlbyname( "hw.memsize", &memsize, &len, NULL, 0 )) + info->MmHighestPhysicalPage = max(1, memsize / page_size); #elif defined(_SC_PHYS_PAGES) LONG64 phys_pages = sysconf( _SC_PHYS_PAGES );

1 0

Alex Henrie : winmm/tests: Use calloc instead of HeapAlloc.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 1817d4cc12ef7484b862399fdb52c97b6c1ee432 URL: https://gitlab.winehq.org/wine/wine/-/commit/1817d4cc12ef7484b862399fdb52c9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 11 13:37:22 2023 -0700 winmm/tests: Use calloc instead of HeapAlloc. Fixes: bb6bcaf83e91882e0a523a4455ed7174b3ce3ad4 --- dlls/winmm/tests/wave.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8c48e52cb01..673c2c010ac 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1586,8 +1586,7 @@ static void test_fragmentsize(void) memset(hdr, 0, sizeof(hdr)); hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 4) + 1; hdr[1].dwBufferLength = hdr[0].dwBufferLength - 2; - hdr[1].lpData = hdr[0].lpData = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + hdr[1].lpData = hdr[0].lpData = calloc(1, hdr[0].dwBufferLength); rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); @@ -1694,8 +1693,7 @@ static void test_reentrant_callback(void) memset(hdr, 0, sizeof(hdr)); hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 10); hdr[1].dwBufferLength = hdr[0].dwBufferLength; - hdr[1].lpData = hdr[0].lpData = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + hdr[1].lpData = hdr[0].lpData = calloc(1, hdr[0].dwBufferLength); rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc));

1 0

Henri Verbeet : build: Make doxygen output slightly less verbose.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: vkd3d Branch: master Commit: b7480911a88a4d25e4a4d391fb0c71f1065e5337 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7480911a88a4d25e4a4d391fb0c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 13 13:45:13 2023 +0100 build: Make doxygen output slightly less verbose. There is perhaps a bit of a trade-off involved here, but with the current state of things it's fairly hard to notice unexpected issues in the output. --- Doxyfile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Doxyfile.in b/Doxyfile.in index a20e6f02..3ecad918 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -8,6 +8,9 @@ OUTPUT_DIRECTORY = doc JAVADOC_AUTOBRIEF = YES OPTIMIZE_OUTPUT_FOR_C = YES EXTRACT_STATIC = YES +QUIET = YES +WARN_IF_UNDOCUMENTED = NO +LATEX_BATCHMODE = YES INPUT = @srcdir@/include/vkd3d.h \ @srcdir@/include/vkd3d_shader.h \

1 0

Alex Henrie : gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 2fcbfc4ca6bfb39e68cdad9c3c61bc567711ed59 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fcbfc4ca6bfb39e68cdad9c3c61bc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 11 14:27:37 2023 -0700 gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree. This partially reverts commit 0b7eed0310a2d1272a97d8a45ec37fa03a9c26c8. --- dlls/gdi32/tests/dc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 69cd44107a0..4d09de78d67 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -285,13 +285,13 @@ static void test_GdiConvertToDevmodeW(void) dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize >= FIELD_OFFSET(DEVMODEW, dmICMMethod), "dmSize is too small: %04x\n", dmW->dmSize); ok(dmW->dmSize <= sizeof(DEVMODEW), "dmSize is too large: %04x\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + sizeof(dmA.dmFields); dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields), "wrong size %u\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmICMMethod = DMICMMETHOD_NONE; dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod) + sizeof(dmA.dmICMMethod); @@ -300,13 +300,13 @@ static void test_GdiConvertToDevmodeW(void) "wrong size %u\n", dmW->dmSize); ok(dmW->dmICMMethod == DMICMMETHOD_NONE, "expected DMICMMETHOD_NONE, got %lu\n", dmW->dmICMMethod); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmSize = 1024; dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), "wrong size %u\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); SetLastError(0xdeadbeef); dmA.dmSize = 0; @@ -319,7 +319,7 @@ static void test_GdiConvertToDevmodeW(void) dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields), "expected %04lx, got %04x\n", FIELD_OFFSET(DEVMODEW, dmFields), dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); } static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale )

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle missing flags as zero for CMP2.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: vkd3d Branch: master Commit: 408f67c69c32744fcdb940957dbf077301e87703 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/408f67c69c32744fcdb940957dbf0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 13:13:53 2023 +1000 vkd3d-shader/dxil: Handle missing flags as zero for CMP2. The flag operand is omitted if IEEE strictness is specified. --- libs/vkd3d-shader/dxil.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0297be37..04dfdf57 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3494,11 +3494,11 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor { struct vkd3d_shader_src_param *src_params; const struct sm6_type *type_a, *type_b; + bool is_int, is_fp, silence_warning; const struct sm6_cmp_info *cmp; const struct sm6_value *a, *b; + uint64_t code, flags; unsigned int i = 0; - bool is_int, is_fp; - uint64_t code; if (!(dst->type = sm6->bool_type)) { @@ -3549,29 +3549,26 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor vsir_instruction_init(ins, &sm6->p.location, cmp->handler_idx); - if (record->operand_count > i) - { - uint64_t flags = record->operands[i]; - bool silence_warning = false; + flags = (record->operand_count > i) ? record->operands[i] : 0; + silence_warning = false; - if (is_fp) - { - if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) - ins->flags |= VKD3DSI_PRECISE_X; - flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ - silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); - } - if (flags && silence_warning) - { - TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags); - } - else if (flags) - { - WARN("Ignoring flags %#"PRIx64".\n", flags); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring flags %#"PRIx64" for a comparison operation.", flags); - } + if (is_fp) + { + if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) + ins->flags |= VKD3DSI_PRECISE_X; + flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; + /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ + silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); + } + if (flags && silence_warning) + { + TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags); + } + else if (flags) + { + WARN("Ignoring flags %#"PRIx64".\n", flags); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring flags %#"PRIx64" for a comparison operation.", flags); } src_params = instruction_src_params_alloc(ins, 2, sm6);

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle missing flags as zero for BINOP.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: vkd3d Branch: master Commit: f1e9f400612d6b573ec927044fb295a5f5ea67f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f1e9f400612d6b573ec927044fb29… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 13:10:33 2023 +1000 vkd3d-shader/dxil: Handle missing flags as zero for BINOP. The flag operand is omitted if IEEE strictness is specified. --- libs/vkd3d-shader/dxil.c | 82 +++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 82308ff6..0297be37 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2821,8 +2821,9 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco struct vkd3d_shader_src_param *src_params; enum vkd3d_shader_opcode handler_idx; const struct sm6_value *a, *b; + uint64_t code, flags; + bool silence_warning; unsigned int i = 0; - uint64_t code; a = sm6_parser_get_value_by_ref(sm6, record, NULL, &i); b = sm6_parser_get_value_by_ref(sm6, record, a->type, &i); @@ -2838,48 +2839,45 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco vsir_instruction_init(ins, &sm6->p.location, handler_idx); - if (record->operand_count > i && record->operands[i]) - { - uint64_t flags = record->operands[i]; - bool silence_warning = false; + flags = (record->operand_count > i) ? record->operands[i] : 0; + silence_warning = false; - switch (handler_idx) - { - case VKD3DSIH_ADD: - case VKD3DSIH_MUL: - case VKD3DSIH_DIV: - case VKD3DSIH_FREM: - if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) - ins->flags |= VKD3DSI_PRECISE_X; - flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ - silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); - break; - case VKD3DSIH_IADD: - case VKD3DSIH_UMUL: - case VKD3DSIH_ISHL: - silence_warning = !(flags & ~(OB_NO_UNSIGNED_WRAP | OB_NO_SIGNED_WRAP)); - break; - case VKD3DSIH_ISHR: - case VKD3DSIH_USHR: - case VKD3DSIH_IDIV: - case VKD3DSIH_UDIV: - silence_warning = !(flags & ~PEB_EXACT); - break; - default: - break; - } - /* The above flags are very common and cause warning spam. */ - if (flags && silence_warning) - { - TRACE("Ignoring flags %#"PRIx64".\n", flags); - } - else if (flags) - { - WARN("Ignoring flags %#"PRIx64".\n", flags); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring flags %#"PRIx64" for a binary operation.", flags); - } + switch (handler_idx) + { + case VKD3DSIH_ADD: + case VKD3DSIH_MUL: + case VKD3DSIH_DIV: + case VKD3DSIH_FREM: + if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) + ins->flags |= VKD3DSI_PRECISE_X; + flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; + /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ + silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); + break; + case VKD3DSIH_IADD: + case VKD3DSIH_UMUL: + case VKD3DSIH_ISHL: + silence_warning = !(flags & ~(OB_NO_UNSIGNED_WRAP | OB_NO_SIGNED_WRAP)); + break; + case VKD3DSIH_ISHR: + case VKD3DSIH_USHR: + case VKD3DSIH_IDIV: + case VKD3DSIH_UDIV: + silence_warning = !(flags & ~PEB_EXACT); + break; + default: + break; + } + /* The above flags are very common and cause warning spam. */ + if (flags && silence_warning) + { + TRACE("Ignoring flags %#"PRIx64".\n", flags); + } + else if (flags) + { + WARN("Ignoring flags %#"PRIx64".\n", flags); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring flags %#"PRIx64" for a binary operation.", flags); } src_params = instruction_src_params_alloc(ins, 2, sm6);

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
99
Older →

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 November 2023