- Wine-Commits - list.winehq.org

Eric Pouech : dmime: Generate track flags while in loop.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: ef2830b62033a0feb66471ce83f88cb9f5602370 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef2830b62033a0feb66471ce83f88c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jan 30 15:41:12 2024 +0100 dmime: Generate track flags while in loop. Store track_flags inside segment state so that they can be reused in subsequent calls. The start/seek/loop flags are now properly set when calling IDirectMusicTrack_Play(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/segmentstate.c | 13 ++++++++----- dlls/dmime/wavetrack.c | 7 +++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 51067d21d3d..0deb396d384 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -56,6 +56,7 @@ struct segment_state MUSIC_TIME played; BOOL auto_download; DWORD repeats, actual_repeats; + DWORD track_flags; struct list tracks; }; @@ -385,12 +386,13 @@ static HRESULT segment_state_play_until(struct segment_state *This, IDirectMusic } This->played = played; + This->track_flags &= ~(DMUS_TRACKF_START|DMUS_TRACKF_DIRTY); if (This->start_point + This->played >= This->end_point) return S_FALSE; return S_OK; } static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusicPerformance8 *performance, - REFERENCE_TIME duration, DWORD track_flags) + REFERENCE_TIME duration) { IDirectMusicSegmentState *iface = (IDirectMusicSegmentState *)&This->IDirectMusicSegmentState8_iface; MUSIC_TIME next_time; @@ -404,7 +406,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic time + duration, &next_time))) return hr; - while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) + while ((hr = segment_state_play_until(This, performance, next_time, This->track_flags)) == S_FALSE) { if (!This->actual_repeats) { @@ -424,6 +426,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic break; This->start_time += This->end_point - This->start_point; This->actual_repeats--; + This->track_flags |= DMUS_TRACKF_LOOP | DMUS_TRACKF_SEEK; if (next_time <= This->start_time || This->end_point <= This->start_point) break; } @@ -444,8 +447,8 @@ HRESULT segment_state_play(IDirectMusicSegmentState *iface, IDirectMusicPerforma return hr; } - if (FAILED(hr = segment_state_play_chunk(This, performance, 10000000, - DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY))) + This->track_flags = DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY; + if (FAILED(hr = segment_state_play_chunk(This, performance, 10000000))) return hr; if (hr == S_FALSE) return S_OK; @@ -458,7 +461,7 @@ HRESULT segment_state_tick(IDirectMusicSegmentState *iface, IDirectMusicPerforma TRACE("%p %p\n", iface, performance); - return segment_state_play_chunk(This, performance, 10000000, 0); + return segment_state_play_chunk(This, performance, 10000000); } HRESULT segment_state_stop(IDirectMusicSegmentState *iface, IDirectMusicPerformance8 *performance) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 7f2fe4a8e5f..3d64e6e84c5 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -147,6 +147,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat MUSIC_TIME start_time, MUSIC_TIME end_time, MUSIC_TIME time_offset, DWORD track_flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD track_id) { + static const DWORD handled_track_flags = DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY | DMUS_TRACKF_LOOP; struct wave_track *This = impl_from_IDirectMusicTrack8(iface); LONG volume = This->header.lVolume; IDirectMusicGraph *graph; @@ -157,9 +158,11 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat TRACE("(%p, %p, %ld, %ld, %ld, %#lx, %p, %p, %ld)\n", This, state_data, start_time, end_time, time_offset, track_flags, performance, segment_state, track_id); - if (track_flags) FIXME("track_flags %#lx not implemented\n", track_flags); + if (track_flags & ~handled_track_flags) + FIXME("track_flags %#lx not implemented\n", track_flags & ~handled_track_flags); if (segment_state) FIXME("segment_state %p not implemented\n", segment_state); - if (!(track_flags & DMUS_TRACKF_START)) return S_OK; + + if (!(track_flags & (DMUS_TRACKF_START | DMUS_TRACKF_LOOP))) return S_OK; if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph)))

1 0

Eric Pouech : dmime: Fully implement IDirectMusicSegmentState::GetRepeats().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: ed92095f28808282c5338a5cb89ec758f7b3b4e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed92095f28808282c5338a5cb89ec7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 17:57:08 2024 +0100 dmime: Fully implement IDirectMusicSegmentState::GetRepeats(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/segmentstate.c | 10 ++++++---- dlls/dmime/tests/dmime.c | 3 --- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 3b939bc95ca..38ff9185534 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -53,7 +53,7 @@ struct segment_state MUSIC_TIME end_point; MUSIC_TIME played; BOOL auto_download; - DWORD repeats; + DWORD repeats, actual_repeats; struct list tracks; }; @@ -117,7 +117,8 @@ static ULONG WINAPI segment_state_Release(IDirectMusicSegmentState8 *iface) static HRESULT WINAPI segment_state_GetRepeats(IDirectMusicSegmentState8 *iface, DWORD *repeats) { struct segment_state *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %p): semi-stub\n", This, repeats); + TRACE("(%p, %p)\n", This, repeats); + *repeats = This->repeats; return S_OK; } @@ -236,6 +237,7 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetStartPoint(segment, &This->start_point); if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetLength(segment, &This->end_point); if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetRepeats(segment, &This->repeats); + if (SUCCEEDED(hr)) This->actual_repeats = This->repeats; for (i = 0; SUCCEEDED(hr); i++) { @@ -315,7 +317,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) { - if (!This->repeats) + if (!This->actual_repeats) { MUSIC_TIME end_time = This->start_time + This->played; @@ -332,7 +334,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic &This->end_point))) break; This->start_time += This->end_point - This->start_point; - This->repeats--; + This->actual_repeats--; if (next_time <= This->start_time || This->end_point <= This->start_point) break; } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 26fdf3ef2a5..f6f34915547 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4540,7 +4540,6 @@ static void test_segment_state(void) value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); @@ -4624,7 +4623,6 @@ static void test_segment_state(void) value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); @@ -4655,7 +4653,6 @@ static void test_segment_state(void) value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time);

1 0

Eric Pouech : dmime: Use sent duration in loop's playback.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: 36d6fe591b795f77fdcc34837a640da2f8c49ef7 URL: https://gitlab.winehq.org/wine/wine/-/commit/36d6fe591b795f77fdcc34837a640d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jan 30 17:16:15 2024 +0100 dmime: Use sent duration in loop's playback. When playing a loop, and if no end of loop point has been defined (meaning = play whole segment), don't rely on segment's length for wave tracks as their length is always 1. Compute segment length in this case by grabbing each track's playback length in segment state's internal graph. This feature is only activated for messages generated by wave tracks, but could be extended if needed to other types of messages. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/segmentstate.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/dmime/tests/dmime.c | 22 +++++++++++++++------- dlls/dmime/wavetrack.c | 6 +++--- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 0deb396d384..4fece4181e1 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -54,6 +54,10 @@ struct segment_state MUSIC_TIME start_point; MUSIC_TIME end_point; MUSIC_TIME played; + + REFERENCE_TIME actual_duration; + MUSIC_TIME actual_end_point; + BOOL auto_download; DWORD repeats, actual_repeats; DWORD track_flags; @@ -227,12 +231,29 @@ static ULONG WINAPI segment_state_graph_Release(IDirectMusicGraph *iface) static HRESULT WINAPI segment_state_graph_StampPMsg(IDirectMusicGraph *iface, DMUS_PMSG *msg) { struct segment_state *This = impl_from_IDirectMusicGraph(iface); + HRESULT hr; TRACE("(%p, %p)\n", This, msg); if (!msg) return E_POINTER; - return IDirectMusicGraph_StampPMsg(This->parent_graph, msg); + hr = IDirectMusicGraph_StampPMsg(This->parent_graph, msg); + if (SUCCEEDED(hr)) + { + switch (msg->dwType) + { + case DMUS_PMSGT_WAVE: + if (msg->dwFlags & (DMUS_PMSGF_REFTIME | DMUS_PMSGF_MUSICTIME)) + { + if (((DMUS_WAVE_PMSG *)msg)->rtDuration > This->actual_duration) + This->actual_duration = ((DMUS_WAVE_PMSG *)msg)->rtDuration; + } + break; + default: ; + } + } + + return hr; } static HRESULT WINAPI segment_state_graph_InsertTool(IDirectMusicGraph *iface, IDirectMusicTool *tool, @@ -373,6 +394,9 @@ static HRESULT segment_state_play_until(struct segment_state *This, IDirectMusic played = min(end_time - This->start_time, This->end_point - This->start_point); + if (This->track_flags & DMUS_TRACKF_DIRTY) + This->actual_duration = 0; + LIST_FOR_EACH_ENTRY(entry, &This->tracks, struct track_entry, entry) { if (FAILED(hr = IDirectMusicTrack_Play(entry->track, entry->state_data, @@ -424,6 +448,17 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic if (FAILED(hr = IDirectMusicSegment_GetLoopPoints(This->segment, &This->played, &This->end_point))) break; + if (!This->played && !This->end_point) + { + if (!This->actual_end_point && This->actual_duration) + { + IDirectMusicPerformance_ReferenceToMusicTime(performance, time + This->actual_duration, &This->actual_end_point); + This->actual_end_point -= This->start_time + This->played; + } + This->end_point = This->actual_end_point; + if (next_time < This->start_time + This->end_point) + next_time += This->end_point - This->start_point; + } This->start_time += This->end_point - This->start_point; This->actual_repeats--; This->track_flags |= DMUS_TRACKF_LOOP | DMUS_TRACKF_SEEK; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 8ae62b38670..218dc01045d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3660,11 +3660,21 @@ static void test_wave_pmsg(unsigned num_repeats) for (i = 0; i <= num_repeats; i++) { - ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); - todo_wine_if(num_repeats && ret) - ok(!ret, "got %#lx\n", ret); - if (ret) continue; - ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); + /* Both native and builtin dmime queue messages for a given amount of time, + * then wait for these messages to be processed before queuing additional messages. + * However, Wine "wait" time is way smaller than native, and is hit before the 10 + * reiterations in loop here. + * And moreover, Wine uses internal messages for this "wait" operation. + * Discard Wine's internal messages to be on par with native. + */ + do + { + ret = test_tool_wait_message(tool, 2000, (DMUS_PMSG **)&wave); + ok(!ret, "got %#lx\n", ret); + } while (num_repeats && !ret && (wave->dwType >= 0x10 || wave->dwType == DMUS_PMSGT_DIRTY)); + if (ret) break; + + ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p %lu\n", wave, wave->dwType); ok(wave->dwSize == sizeof(*wave), "got %lu\n", wave->dwSize); ok(!!wave->punkUser, "got %p\n", wave->punkUser); ok((wave->dwFlags & DMUS_PMSGF_REFTIME) && (wave->dwFlags & DMUS_PMSGF_MUSICTIME), @@ -3672,7 +3682,6 @@ static void test_wave_pmsg(unsigned num_repeats) if (i == 0) mt_start_ref = wave->mtTime; else - todo_wine ok(wave->mtTime == mt_start_ref + length * i, "got %lu (%lu,%lu)\n", wave->mtTime, mt_start_ref, i * length); ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); ok(wave->rtDuration == 1000000, "got %I64d\n", wave->rtDuration); @@ -3685,7 +3694,6 @@ static void test_wave_pmsg(unsigned num_repeats) } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine_if(num_repeats) ok(!ret, "got %#lx\n", ret); if (!ret) { diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 3d64e6e84c5..64480c6422f 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -160,11 +160,11 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat if (track_flags & ~handled_track_flags) FIXME("track_flags %#lx not implemented\n", track_flags & ~handled_track_flags); - if (segment_state) FIXME("segment_state %p not implemented\n", segment_state); - if (!(track_flags & (DMUS_TRACKF_START | DMUS_TRACKF_LOOP))) return S_OK; - if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance, + if (FAILED(hr = IDirectMusicSegmentState_QueryInterface(segment_state, + &IID_IDirectMusicGraph, (void **)&graph)) && + FAILED(hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph))) return hr;

1 0

Conor McCarthy : vkd3d-shader/dxil: Support forward-referenced value ids.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: vkd3d Branch: master Commit: efddcc9a99e671f3553c34b28a2c3ec5b76f6166 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/efddcc9a99e671f3553c34b28a2c3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 13 00:18:50 2023 +1000 vkd3d-shader/dxil: Support forward-referenced value ids. --- libs/vkd3d-shader/dxil.c | 82 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e718ed84..bd165146 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2179,21 +2179,29 @@ static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type } static void register_init_ssa_vector(struct vkd3d_shader_register *reg, const struct sm6_type *type, - unsigned int component_count, struct sm6_parser *sm6) + unsigned int component_count, struct sm6_value *value, struct sm6_parser *sm6) { enum vkd3d_data_type data_type; unsigned int id; - id = sm6_parser_alloc_ssa_id(sm6); + if (value && register_is_ssa(&value->u.reg) && value->u.reg.idx[0].offset) + { + id = value->u.reg.idx[0].offset; + TRACE("Using forward-allocated id %u.\n", id); + } + else + { + id = sm6_parser_alloc_ssa_id(sm6); + } data_type = vkd3d_data_type_from_sm6_type(sm6_type_get_scalar_type(type, 0)); register_init_with_id(reg, VKD3DSPR_SSA, data_type, id); reg->dimension = component_count > 1 ? VSIR_DIMENSION_VEC4 : VSIR_DIMENSION_SCALAR; } static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const struct sm6_type *type, - struct sm6_parser *sm6) + struct sm6_value *value, struct sm6_parser *sm6) { - register_init_ssa_vector(reg, type, 1, sm6); + register_init_ssa_vector(reg, sm6_type_get_scalar_type(type, 0), 1, value, sm6); } static void dst_param_init(struct vkd3d_shader_dst_param *param) @@ -2218,10 +2226,10 @@ static void dst_param_init_vector(struct vkd3d_shader_dst_param *param, unsigned } static void dst_param_init_ssa_scalar(struct vkd3d_shader_dst_param *param, const struct sm6_type *type, - struct sm6_parser *sm6) + struct sm6_value *value, struct sm6_parser *sm6) { dst_param_init(param); - register_init_ssa_scalar(&param->reg, type, sm6); + register_init_ssa_scalar(&param->reg, type, value, sm6); } static inline void src_param_init(struct vkd3d_shader_src_param *param) @@ -2278,7 +2286,7 @@ static void instruction_dst_param_init_ssa_scalar(struct vkd3d_shader_instructio struct vkd3d_shader_dst_param *param = instruction_dst_params_alloc(ins, 1, sm6); struct sm6_value *dst = sm6_parser_get_current_value(sm6); - dst_param_init_ssa_scalar(param, dst->type, sm6); + dst_param_init_ssa_scalar(param, dst->type, dst, sm6); param->write_mask = VKD3DSP_WRITEMASK_0; dst->u.reg = param->reg; } @@ -2290,7 +2298,7 @@ static void instruction_dst_param_init_ssa_vector(struct vkd3d_shader_instructio struct sm6_value *dst = sm6_parser_get_current_value(sm6); dst_param_init_vector(param, component_count); - register_init_ssa_vector(&param->reg, sm6_type_get_scalar_type(dst->type, 0), component_count, sm6); + register_init_ssa_vector(&param->reg, sm6_type_get_scalar_type(dst->type, 0), component_count, dst, sm6); dst->u.reg = param->reg; } @@ -2453,6 +2461,7 @@ static const struct sm6_value *sm6_parser_get_value_safe(struct sm6_parser *sm6, static size_t sm6_parser_get_value_idx_by_ref(struct sm6_parser *sm6, const struct dxil_record *record, const struct sm6_type *fwd_type, unsigned int *rec_idx) { + struct sm6_value *value; unsigned int idx; uint64_t val_ref; size_t operand; @@ -2466,23 +2475,39 @@ static size_t sm6_parser_get_value_idx_by_ref(struct sm6_parser *sm6, const stru if (operand == SIZE_MAX) return SIZE_MAX; - if (operand >= sm6->value_count) + if (operand >= sm6->value_count && !fwd_type) + { + /* Forward references are followed by a type id unless an earlier operand set the type, + * or it is contained in a function declaration. */ + if (!dxil_record_validate_operand_min_count(record, idx + 1, sm6)) + return SIZE_MAX; + if (!(fwd_type = sm6_parser_get_type(sm6, record->operands[idx++]))) + return SIZE_MAX; + } + *rec_idx = idx; + + if (fwd_type) { - if (!fwd_type) + value = &sm6->values[operand]; + if (value->type) { - /* Forward references are followed by a type id unless an earlier operand set the type, - * or it is contained in a function declaration. */ - if (!dxil_record_validate_operand_min_count(record, idx + 1, sm6)) - return SIZE_MAX; - if (!(fwd_type = sm6_parser_get_type(sm6, record->operands[idx++]))) - return SIZE_MAX; + if (value->type != fwd_type) + { + WARN("Value already has a mismatching type.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH, + "The type of a source value does not match the predefined type."); + } + } + else + { + value->type = fwd_type; + value->value_type = VALUE_TYPE_REG; + register_init_with_id(&value->u.reg, VKD3DSPR_SSA, vkd3d_data_type_from_sm6_type( + sm6_type_get_scalar_type(fwd_type, 0)), sm6_parser_alloc_ssa_id(sm6)); + value->u.reg.dimension = sm6_type_is_scalar(fwd_type) ? VSIR_DIMENSION_SCALAR + : VSIR_DIMENSION_VEC4; } - FIXME("Forward value references are not supported yet.\n"); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, - "Unsupported value forward reference."); - return SIZE_MAX; } - *rec_idx = idx; return operand; } @@ -3479,7 +3504,7 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco dst_param_init(&dst_params[0]); dst_param_init(&dst_params[1]); - register_init_ssa_scalar(&dst_params[index].reg, a->type, sm6); + register_init_ssa_scalar(&dst_params[index].reg, a->type, dst, sm6); vsir_register_init(&dst_params[index ^ 1].reg, VKD3DSPR_NULL, VKD3D_DATA_UNUSED, 0); dst->u.reg = dst_params[index].reg; } @@ -3992,7 +4017,7 @@ static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_ dst_params = instruction_dst_params_alloc(ins, 2, sm6); dst_param_init(&dst_params[0]); dst_param_init(&dst_params[1]); - register_init_ssa_scalar(&dst_params[index].reg, dst->type, sm6); + register_init_ssa_scalar(&dst_params[index].reg, dst->type, dst, sm6); vsir_register_init(&dst_params[index ^ 1].reg, VKD3DSPR_NULL, VKD3D_DATA_UNUSED, 0); dst->u.reg = dst_params[index].reg; } @@ -4931,7 +4956,7 @@ static void sm6_parser_emit_phi(struct sm6_parser *sm6, const struct dxil_record } dst->type = type; - register_init_ssa_scalar(&dst->u.reg, type, sm6); + register_init_ssa_scalar(&dst->u.reg, type, dst, sm6); if (!(phi = sm6_block_phi_require_space(code_block, sm6))) return; @@ -5504,6 +5529,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const struct vkd3d_shader_instruction *ins; size_t i, block_idx, block_count; const struct dxil_record *record; + const struct sm6_type *fwd_type; bool ret_found, is_terminator; struct sm6_block *code_block; struct sm6_value *dst; @@ -5580,6 +5606,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const ins->handler_idx = VKD3DSIH_INVALID; dst = sm6_parser_get_current_value(sm6); + fwd_type = dst->type; dst->type = NULL; dst->value_type = VALUE_TYPE_REG; is_terminator = false; @@ -5659,6 +5686,13 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const else assert(ins->handler_idx == VKD3DSIH_NOP); + if (dst->type && fwd_type && dst->type != fwd_type) + { + WARN("Type mismatch.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH, + "The type of a result value does not match the type defined by a forward reference."); + } + sm6->value_count += !!dst->type; }

1 0

Alexandre Julliard : ntdll: Use the correct machine when loading ntdll on ARM64EC.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: c1295953816e6b071e6ad0e58f142a3b5f74574c URL: https://gitlab.winehq.org/wine/wine/-/commit/c1295953816e6b071e6ad0e58f142a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 19:07:40 2024 +0100 ntdll: Use the correct machine when loading ntdll on ARM64EC. --- dlls/ntdll/unix/loader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 662ec5ef7a8..05284115b67 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1641,6 +1641,7 @@ static void load_ntdll(void) static WCHAR path[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\','n','t','d','l','l','.','d','l','l',0}; const char *pe_dir = get_pe_dir( current_machine ); + USHORT machine = current_machine; unsigned int status; SECTION_IMAGE_INFORMATION info; OBJECT_ATTRIBUTES attr; @@ -1654,7 +1655,9 @@ static void load_ntdll(void) if (build_dir) asprintf( &name, "%s%s/ntdll.dll", ntdll_dir, pe_dir ); else asprintf( &name, "%s%s/ntdll.dll", dll_dir, pe_dir ); - status = open_builtin_pe_file( name, &attr, &module, &size, &info, 0, 0, current_machine, FALSE ); + + if (is_arm64ec()) machine = main_image_info.Machine; + status = open_builtin_pe_file( name, &attr, &module, &size, &info, 0, 0, machine, FALSE ); if (status == STATUS_DLL_NOT_FOUND) { free( name );

1 0

Alexandre Julliard : ntdll: Update the image information when loading a builtin dll.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: 0d37cc1d0637551ceae42773f0e1f059b380fa12 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d37cc1d0637551ceae42773f0e1f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 19:04:29 2024 +0100 ntdll: Update the image information when loading a builtin dll. --- dlls/ntdll/unix/loader.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 803d8079213..662ec5ef7a8 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1277,11 +1277,11 @@ done: * Return STATUS_IMAGE_ALREADY_LOADED if we should keep the native one that we have found. */ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, USHORT machine, - void **module, SIZE_T *size, ULONG_PTR limit_low, ULONG_PTR limit_high ) + SECTION_IMAGE_INFORMATION *info, void **module, SIZE_T *size, + ULONG_PTR limit_low, ULONG_PTR limit_high ) { NTSTATUS status; UNICODE_STRING nt_name; - SECTION_IMAGE_INFORMATION info; enum loadorder loadorder; init_unicode_string( &nt_name, filename ); @@ -1307,10 +1307,10 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, USHOR case LO_NATIVE_BUILTIN: return STATUS_IMAGE_ALREADY_LOADED; case LO_BUILTIN: - return find_builtin_dll( &nt_name, module, size, &info, limit_low, limit_high, + return find_builtin_dll( &nt_name, module, size, info, limit_low, limit_high, image_info->machine, machine, FALSE ); default: - status = find_builtin_dll( &nt_name, module, size, &info, limit_low, limit_high, + status = find_builtin_dll( &nt_name, module, size, info, limit_low, limit_high, image_info->machine, machine, (loadorder == LO_DEFAULT) ); if (status == STATUS_DLL_NOT_FOUND || status == STATUS_NOT_SUPPORTED) return STATUS_IMAGE_ALREADY_LOADED; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 07f2724eac7..af746b220e8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -185,7 +185,8 @@ extern char **build_envp( const WCHAR *envW ); extern char *get_alternate_wineloader( WORD machine ); extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ); extern NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, USHORT machine, - void **addr_ptr, SIZE_T *size_ptr, ULONG_PTR limit_low, ULONG_PTR limit_high ); + SECTION_IMAGE_INFORMATION *info, void **module, SIZE_T *size, + ULONG_PTR limit_low, ULONG_PTR limit_high ); extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ); extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, USHORT load_machine, WCHAR **image, void **module ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2a53f56879e..cfe19eae89d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3161,9 +3161,12 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P if (image_info) { + SECTION_IMAGE_INFORMATION info; + filename = (WCHAR *)(image_info + 1); /* check if we can replace that mapping with the builtin */ - res = load_builtin( image_info, filename, machine, addr_ptr, size_ptr, limit_low, limit_high ); + res = load_builtin( image_info, filename, machine, &info, + addr_ptr, size_ptr, limit_low, limit_high ); if (res == STATUS_IMAGE_ALREADY_LOADED) res = virtual_map_image( handle, addr_ptr, size_ptr, shared_file, limit_low, limit_high, alloc_type, machine, image_info, filename, FALSE ); @@ -3462,12 +3465,13 @@ NTSTATUS virtual_map_module( HANDLE mapping, void **module, SIZE_T *size, SECTIO filename = (WCHAR *)(image_info + 1); /* check if we can replace that mapping with the builtin */ - status = load_builtin( image_info, filename, machine, module, size, limit_low, limit_high ); + status = load_builtin( image_info, filename, machine, info, module, size, limit_low, limit_high ); if (status == STATUS_IMAGE_ALREADY_LOADED) + { status = virtual_map_image( mapping, module, size, shared_file, limit_low, limit_high, 0, machine, image_info, filename, FALSE ); - - virtual_fill_image_information( image_info, info ); + virtual_fill_image_information( image_info, info ); + } if (shared_file) NtClose( shared_file ); free( image_info ); return status;

1 0

Alexandre Julliard : ntdll/tests: Add some process machine tests for ARM64X.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: 818b5777273ce793573dad1f2fbaa0db26bbac02 URL: https://gitlab.winehq.org/wine/wine/-/commit/818b5777273ce793573dad1f2fbaa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 13:17:45 2024 +0100 ntdll/tests: Add some process machine tests for ARM64X. --- dlls/ntdll/tests/wow64.c | 140 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 6 deletions(-)

1 0

Alexandre Julliard : server: Don't report alternate 64-bit machines as supported.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: 4022fb9ba3eacd6b09d35b457754a7e17c67564e URL: https://gitlab.winehq.org/wine/wine/-/commit/4022fb9ba3eacd6b09d35b457754a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 15:46:11 2024 +0100 server: Don't report alternate 64-bit machines as supported. --- dlls/ntdll/unix/system.c | 26 +++++++++++++------------- server/registry.c | 12 ++---------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index d2df1dd50c2..cb99b7c2cc3 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3385,24 +3385,24 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, ret = STATUS_BUFFER_TOO_SMALL; break; } - for (i = 0; i < supported_machines_count; i++) + memset( machines, 0, len ); + + /* native machine */ + machines[0].Machine = supported_machines[0]; + machines[0].UserMode = 1; + machines[0].KernelMode = 1; + machines[0].Native = 1; + machines[0].Process = (supported_machines[0] == machine || is_machine_64bit( machine )); + machines[0].WoW64Container = 0; + machines[0].ReservedZero0 = 0; + /* wow64 machines */ + for (i = 1; i < supported_machines_count; i++) { machines[i].Machine = supported_machines[i]; machines[i].UserMode = 1; - machines[i].KernelMode = machines[i].Native = i == 0; machines[i].Process = supported_machines[i] == machine; - machines[i].WoW64Container = 0; - machines[i].ReservedZero0 = 0; + machines[i].WoW64Container = 1; } - - machines[i].Machine = 0; - machines[i].KernelMode = 0; - machines[i].UserMode = 0; - machines[i].Native = 0; - machines[i].Process = 0; - machines[i].WoW64Container = 0; - machines[i].ReservedZero0 = 0; - ret = STATUS_SUCCESS; break; } diff --git a/server/registry.c b/server/registry.c index da6a6d0982e..e88bed1e72e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1857,10 +1857,9 @@ static void init_supported_machines(void) if (prefix_type == PREFIX_64BIT) { supported_machines[count++] = IMAGE_FILE_MACHINE_ARM64; - supported_machines[count++] = IMAGE_FILE_MACHINE_AMD64; supported_machines[count++] = IMAGE_FILE_MACHINE_I386; + /* supported_machines[count++] = IMAGE_FILE_MACHINE_ARMNT; not supported yet */ } - supported_machines[count++] = IMAGE_FILE_MACHINE_ARMNT; #else #error Unsupported machine #endif @@ -1877,15 +1876,9 @@ void init_registry(void) static const WCHAR classes_i386[] = {'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\', 'W','o','w','6','4','3','2','N','o','d','e'}; - static const WCHAR classes_amd64[] = {'S','o','f','t','w','a','r','e','\\', - 'C','l','a','s','s','e','s','\\', - 'W','o','w','6','4','6','4','N','o','d','e'}; static const WCHAR classes_arm[] = {'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\', 'W','o','w','A','A','3','2','N','o','d','e'}; - static const WCHAR classes_arm64[] = {'S','o','f','t','w','a','r','e','\\', - 'C','l','a','s','s','e','s','\\', - 'W','o','w','A','A','6','4','N','o','d','e'}; static const WCHAR perflib[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -1956,8 +1949,7 @@ void init_registry(void) { case IMAGE_FILE_MACHINE_I386: name.str = classes_i386; name.len = sizeof(classes_i386); break; case IMAGE_FILE_MACHINE_ARMNT: name.str = classes_arm; name.len = sizeof(classes_arm); break; - case IMAGE_FILE_MACHINE_AMD64: name.str = classes_amd64; name.len = sizeof(classes_amd64); break; - case IMAGE_FILE_MACHINE_ARM64: name.str = classes_arm64; name.len = sizeof(classes_arm64); break; + default: continue; } if ((key = create_key_recursive( hklm, &name, current_time ))) {

1 0

Alexandre Julliard : ntdll: Fix stack layout for ARM syscalls.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: wine Branch: master Commit: b41566fb31b257d04f6044b01d996f71d2859493 URL: https://gitlab.winehq.org/wine/wine/-/commit/b41566fb31b257d04f6044b01d996f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 11:52:30 2024 +0100 ntdll: Fix stack layout for ARM syscalls. --- dlls/ntdll/unix/signal_arm.c | 9 +++++---- include/wine/asm.h | 23 ++++------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 9ca0569bd62..0f6f81d2ee1 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1052,7 +1052,10 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a */ void call_raise_user_exception_dispatcher(void) { - arm_thread_data()->syscall_frame->pc = (DWORD)pKiRaiseUserExceptionDispatcher; + struct syscall_frame *frame = arm_thread_data()->syscall_frame; + + frame->sp += 16; + frame->pc = (DWORD)pKiRaiseUserExceptionDispatcher; } @@ -1608,8 +1611,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ldr r1, [r2, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "add r0, r1, #0x10\n\t" "stm r0, {r4-r12,lr}\n\t" - "add r0, sp, #0x10\n\t" - "str r0, [r1, #0x38]\n\t" + "str sp, [r1, #0x38]\n\t" "str r3, [r1, #0x3c]\n\t" "mrs r0, CPSR\n\t" "bfi r0, lr, #5, #1\n\t" /* set thumb bit */ @@ -1682,7 +1684,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "5:\tmovw r0, #0x000d\n\t" /* STATUS_INVALID_PARAMETER */ "movt r0, #0xc000\n\t" - "add sp, sp, #0x10\n\t" "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" diff --git a/include/wine/asm.h b/include/wine/asm.h index 0fa2dfcd1b7..908c7d7d19a 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -268,34 +268,19 @@ # define __ASM_SYSCALL_FUNC(id,name,args) \ __ASM_GLOBAL_FUNC( name, \ "push {r0-r3}\n\t" \ + ".seh_save_regs {r0-r3}\n\t" \ + ".seh_endprologue\n\t" \ "movw ip, #(" #id ")\n\t" \ "mov r3, lr\n\t" \ "bl " __ASM_NAME("__wine_syscall") "\n\t" \ + "add sp, #16\n\t" \ "bx lr" ) -# ifndef __PIC__ -# define DEFINE_SYSCALL_HELPER32() \ +# define DEFINE_SYSCALL_HELPER32() \ __ASM_GLOBAL_FUNC( __wine_syscall, \ "movw r0, :lower16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ "movt r0, :upper16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ "ldr r0, [r0]\n\t" \ "bx r0" ) -# elif defined __thumb__ -# define DEFINE_SYSCALL_HELPER32() \ - __ASM_GLOBAL_FUNC( __wine_syscall, \ - "ldr r0, 2f\n" \ - "1:\tadd r0, pc\n\t" \ - "ldr r0, [r0]\n\t" \ - "bx r0\n" \ - "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-4" ) -# else -# define DEFINE_SYSCALL_HELPER32() \ - __ASM_GLOBAL_FUNC( __wine_syscall, \ - "ldr r0, 2f\n" \ - "1:\tadd r0, pc\n\t" \ - "ldr r0, [r0]\n\t" \ - "bx r0\n" \ - "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-8" ) -# endif #endif #endif /* __WINE_WINE_ASM_H */

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the ACOS, ASIN and ATAN instructions in spirv_compiler_emit_ext_glsl_instruction().
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: vkd3d Branch: master Commit: 7f87a3e5fcfd940eea352083dfb15bbb6da96258 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7f87a3e5fcfd940eea352083dfb15… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 16:00:47 2024 +1000 vkd3d-shader/spirv: Handle the ACOS, ASIN and ATAN instructions in spirv_compiler_emit_ext_glsl_instruction(). --- libs/vkd3d-shader/spirv.c | 6 ++++ tests/hlsl/inverse-trig.shader_test | 60 ++++++++++++++++++------------------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e9437c6f..5f7a33da 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6997,6 +6997,9 @@ static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction( } glsl_insts[] = { + {VKD3DSIH_ACOS, GLSLstd450Acos}, + {VKD3DSIH_ASIN, GLSLstd450Asin}, + {VKD3DSIH_ATAN, GLSLstd450Atan}, {VKD3DSIH_DFMA, GLSLstd450Fma}, {VKD3DSIH_DMAX, GLSLstd450NMax}, {VKD3DSIH_DMIN, GLSLstd450NMin}, @@ -9581,6 +9584,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_ISFINITE: spirv_compiler_emit_isfinite(compiler, instruction); break; + case VKD3DSIH_ACOS: + case VKD3DSIH_ASIN: + case VKD3DSIH_ATAN: case VKD3DSIH_DFMA: case VKD3DSIH_DMAX: case VKD3DSIH_DMIN: diff --git a/tests/hlsl/inverse-trig.shader_test b/tests/hlsl/inverse-trig.shader_test index dd069fef..0c1fdc01 100644 --- a/tests/hlsl/inverse-trig.shader_test +++ b/tests/hlsl/inverse-trig.shader_test @@ -13,23 +13,23 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (3.14159274, 0.0, 0.0, 0.0) 128 uniform 0 float4 -0.5 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (2.094441441, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (1.57072878, 0.0, 0.0, 0.0) 1024 uniform 0 float4 0.5 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (1.04715133, 0.0, 0.0, 0.0) 512 uniform 0 float4 1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) 128 [pixel shader todo] @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-31416.0, 0.0, 0.0, 0.0) [require] @@ -72,15 +72,15 @@ shader model >= 6.0 % RADV are a bit lower than these, hence the large max ulp difference. [test] uniform 0 float4 -0.5 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (-10472.0, 0.0, 0.0, 0.0) 4096 uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (10472.0, 0.0, 0.0, 0.0) 4096 [require] @@ -88,7 +88,7 @@ probe all rgba (10472.0, 0.0, 0.0, 0.0) 4096 [test] uniform 0 float4 1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (31416.0, 0.0, 0.0, 0.0) @@ -102,23 +102,23 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-0.785409629, 0.0, 0.0, 0.0) 512 uniform 0 float4 -0.5 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.5 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.785409629, 0.0, 0.0, 0.0) 512 [pixel shader todo] @@ -133,64 +133,64 @@ float4 main() : sv_target [test] % Non-degenerate cases uniform 0 float4 1.0 1.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.785385, 0.0, 0.0, 0.0) 512 uniform 0 float4 5.0 -5.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 -3.0 -3.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 -1.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 1.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256 % Degenerate cases uniform 0 float4 0.00001 0.00002 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.463647, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.00001 -0.00002 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (2.677945, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.00001 100000.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048 uniform 0 float4 10000000.0 0.00000001 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 % Negative zero behavior should be to treat it the % same as normal zero. uniform 0 float4 1000000000.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 1000000000.0 -0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.0 -1.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256

1 0