- Wine-Commits - list.winehq.org

Alfred Agrell : winegstreamer: Improve and clean up some debug logs.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 7bcb6bc4d78101748cbe2351710c987516b338c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bcb6bc4d78101748cbe2351710c98… Author: Alfred Agrell <floating(a)muncher.se> Date: Tue Sep 26 23:53:25 2023 +0200 winegstreamer: Improve and clean up some debug logs. --- dlls/winegstreamer/wg_format.c | 11 ++++------- dlls/winegstreamer/wg_parser.c | 27 ++++++++++----------------- dlls/winegstreamer/wg_transform.c | 10 ++-------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 743f674bcd6..d8a580b0197 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -181,17 +181,17 @@ static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstC if (!gst_structure_get_int(structure, "layer", &layer)) { - GST_WARNING("Missing \"layer\" value."); + GST_WARNING("Missing \"layer\" value in %" GST_PTR_FORMAT ".", caps); return; } if (!gst_structure_get_int(structure, "channels", &channels)) { - GST_WARNING("Missing \"channels\" value."); + GST_WARNING("Missing \"channels\" value in %" GST_PTR_FORMAT ".", caps); return; } if (!gst_structure_get_int(structure, "rate", &rate)) { - GST_WARNING("Missing \"rate\" value."); + GST_WARNING("Missing \"rate\" value in %" GST_PTR_FORMAT ".", caps); return; } @@ -318,10 +318,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) } else { - gchar *str = gst_caps_to_string(caps); - - GST_FIXME("Unhandled caps %s.", str); - g_free(str); + GST_FIXME("Unhandled caps %" GST_PTR_FORMAT ".", caps); } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e097325a419..e36fbb92fae 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -456,7 +456,7 @@ static NTSTATUS wg_parser_stream_seek(void *args) if (!push_event(stream->my_sink, gst_event_new_seek(params->rate, GST_FORMAT_TIME, flags, start_type, params->start_pos * 100, stop_type, params->stop_pos == stream->duration ? -1 : params->stop_pos * 100))) - GST_ERROR("Failed to seek.\n"); + GST_ERROR("Failed to seek."); return S_OK; } @@ -480,13 +480,12 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) /* This can happen legitimately if the sample falls outside of the * segment bounds. GStreamer elements shouldn't present the sample in * that case, but DirectShow doesn't care. */ - GST_LOG("Ignoring QoS event.\n"); + GST_LOG("Ignoring QoS event."); return S_OK; } - if (!(event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, params->proportion, diff, stream_time))) - GST_ERROR("Failed to create QOS event.\n"); + GST_ERROR("Failed to create QOS event."); push_event(stream->my_sink, event); return S_OK; @@ -679,6 +678,7 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu if (!stream->enabled) { + GST_LOG("Stream is disabled; discarding buffer."); pthread_mutex_unlock(&parser->mutex); gst_buffer_unref(buffer); return GST_FLOW_OK; @@ -695,7 +695,7 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu if (!gst_buffer_map(buffer, &stream->map_info, GST_MAP_READ)) { pthread_mutex_unlock(&parser->mutex); - GST_ERROR("Failed to map buffer.\n"); + GST_ERROR("Failed to map buffer."); gst_buffer_unref(buffer); return GST_FLOW_ERROR; } @@ -725,7 +725,6 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) case GST_QUERY_CAPS: { GstCaps *caps, *filter, *temp; - gchar *str; gsize i; gst_query_parse_caps(query, &filter); @@ -742,9 +741,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_structure_remove_fields(gst_caps_get_structure(caps, i), "framerate", "pixel-aspect-ratio", NULL); - str = gst_caps_to_string(caps); - GST_LOG("Stream caps are \"%s\".", str); - g_free(str); + GST_LOG("Stream caps are \"%" GST_PTR_FORMAT "\".", caps); if (filter) { @@ -779,12 +776,8 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) pthread_mutex_unlock(&parser->mutex); - if (!ret && gst_debug_category_get_threshold(GST_CAT_DEFAULT) >= GST_LEVEL_WARNING) - { - gchar *str = gst_caps_to_string(caps); - GST_WARNING("Rejecting caps \"%s\".", str); - g_free(str); - } + if (!ret) + GST_WARNING("Rejecting caps \"%" GST_PTR_FORMAT "\".", caps); gst_query_set_accept_caps_result(query, ret); return TRUE; } @@ -1585,7 +1578,7 @@ static NTSTATUS wg_parser_connect(void *args) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - GST_ERROR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream."); goto out; } @@ -1648,7 +1641,7 @@ static NTSTATUS wg_parser_connect(void *args) if (stream->eos) { stream->duration = 0; - GST_WARNING("Failed to query duration.\n"); + GST_WARNING("Failed to query duration."); break; } diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index e2b14527a20..d033ff27f43 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -196,7 +196,6 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery case GST_QUERY_CAPS: { GstCaps *caps, *filter, *temp; - gchar *str; gst_query_parse_caps(query, &filter); if (!(caps = wg_format_to_caps(&transform->output_format))) @@ -209,9 +208,7 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery caps = temp; } - str = gst_caps_to_string(caps); - GST_INFO("Returning caps %s", str); - g_free(str); + GST_INFO("Returning caps %" GST_PTR_FORMAT, caps); gst_query_set_caps_result(query, caps); gst_caps_unref(caps); @@ -498,7 +495,6 @@ NTSTATUS wg_transform_set_output_format(void *args) const struct wg_format *format = params->format; GstSample *sample; GstCaps *caps; - gchar *str; if (!(caps = wg_format_to_caps(format))) { @@ -537,9 +533,7 @@ NTSTATUS wg_transform_set_output_format(void *args) return STATUS_UNSUCCESSFUL; } - str = gst_caps_to_string(caps); - GST_INFO("Configured new caps %s.", str); - g_free(str); + GST_INFO("Configured new caps %" GST_PTR_FORMAT ".", caps); /* Ideally and to be fully compatible with native transform, the queued * output buffers will need to be converted to the new output format and

1 0

Alfred Agrell : winegstreamer: Don't read format from unparsed MPEG audio.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: c36af9e9cf423b22e7bde9db4e0370ec98e60eb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c36af9e9cf423b22e7bde9db4e0370… Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 01:38:55 2023 +0200 winegstreamer: Don't read format from unparsed MPEG audio. --- dlls/winegstreamer/wg_format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 2353839bbc4..9c6e49afcc7 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -286,6 +286,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { const GstStructure *structure = gst_caps_get_structure(caps, 0); const char *name = gst_structure_get_name(structure); + gboolean parsed; memset(format, 0, sizeof(*format)); @@ -303,7 +304,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) if (gst_video_info_from_caps(&info, caps)) wg_format_from_video_info(format, &info); } - else if (!strcmp(name, "audio/mpeg")) + else if (!strcmp(name, "audio/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed) { wg_format_from_caps_audio_mpeg1(format, caps); }

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .idl files.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .rc files.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

1 0

Giovanni Mascellani : tests: Immediately transition resources after readback in the shader runner.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: ca7fa0c0150fd0defb1459ac74f58e393e341a78 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca7fa0c0150fd0defb1459ac74f58… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 23 21:53:51 2023 +0200 tests: Immediately transition resources after readback in the shader runner. The resource could be destructed before the command list left open is executed; instead, we immediately perform the transition. --- tests/d3d12_test_utils.h | 21 +++++++++++++++++++-- tests/shader_runner_d3d12.c | 8 ++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 2c7b10f4..f0c4b411 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -415,8 +415,11 @@ struct d3d12_resource_readback ID3D12Resource *resource; }; -static void get_resource_readback_with_command_list(ID3D12Resource *resource, unsigned int sub_resource, - struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +#define RESOURCE_STATE_DO_NOT_CHANGE (~0u) + +static void get_resource_readback_with_command_list_and_states(ID3D12Resource *resource, unsigned int sub_resource, + struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + D3D12_RESOURCE_STATES initial_state, D3D12_RESOURCE_STATES final_state) { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; @@ -444,6 +447,9 @@ static void get_resource_readback_with_command_list(ID3D12Resource *resource, un rb->rb.row_pitch = align(rb->rb.row_pitch, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->rb.data = NULL; + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, resource, sub_resource, initial_state, D3D12_RESOURCE_STATE_COPY_SOURCE); + src_resource = resource; if (resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER && resource_desc.SampleDesc.Count > 1) { @@ -493,6 +499,10 @@ static void get_resource_readback_with_command_list(ID3D12Resource *resource, un ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); } + + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, resource, sub_resource, D3D12_RESOURCE_STATE_COPY_SOURCE, final_state); + hr = ID3D12GraphicsCommandList_Close(command_list); assert_that(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -509,6 +519,13 @@ static void get_resource_readback_with_command_list(ID3D12Resource *resource, un assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } +static void get_resource_readback_with_command_list(ID3D12Resource *resource, unsigned int sub_resource, + struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +{ + return get_resource_readback_with_command_list_and_states(resource, sub_resource, rb, queue, command_list, + RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); +} + static unsigned int get_readback_uint(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 8453617e..79d637e6 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -546,13 +546,9 @@ static struct resource_readback *d3d12_runner_get_resource_readback(struct shade else state = D3D12_RESOURCE_STATE_UNORDERED_ACCESS; - transition_resource_state(test_context->list, resource->resource, - state, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_resource_readback_with_command_list(resource->resource, 0, rb, - test_context->queue, test_context->list); + get_resource_readback_with_command_list_and_states(resource->resource, 0, rb, + test_context->queue, test_context->list, state, state); reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, state); return &rb->rb; }

1 0

Nikolay Sivov : vkd3d-shader: Check loop [unroll] attribute for conflict with other attributes.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: 26784672d82506c214374344ee575b6e4cd55c23 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/26784672d82506c214374344ee575… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 28 21:30:29 2023 +0200 vkd3d-shader: Check loop [unroll] attribute for conflict with other attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 24 ++++++++++++++++++++++++ tests/hlsl/loop.shader_test | 8 ++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5fd140fb..9a1be71e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -514,6 +514,28 @@ static void resolve_loop_continue(struct hlsl_ctx *ctx, struct hlsl_block *block } } +static void check_loop_attributes(struct hlsl_ctx *ctx, const struct parse_attribute_list *attributes, + const struct vkd3d_shader_location *loc) +{ + bool has_unroll = false, has_loop = false, has_fastopt = false; + unsigned int i; + + for (i = 0; i < attributes->count; ++i) + { + const char *name = attributes->attrs[i]->name; + + has_loop |= !strcmp(name, "loop"); + has_unroll |= !strcmp(name, "unroll"); + has_fastopt |= !strcmp(name, "fastopt"); + } + + if (has_unroll && has_loop) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Unroll attribute can't be used with 'loop' attribute."); + + if (has_unroll && has_fastopt) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Unroll attribute can't be used with 'fastopt' attribute."); +} + static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct hlsl_block *init, struct hlsl_block *cond, struct hlsl_block *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) @@ -524,6 +546,8 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, if (attribute_list_has_duplicates(attributes)) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute."); + check_loop_attributes(ctx, attributes, loc); + /* Ignore unroll(0) attribute, and any invalid attribute. */ for (i = 0; i < attributes->count; ++i) { diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 3d515c9d..6a5240a7 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -158,7 +158,7 @@ todo draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) % unroll can't be used with fastopt or loop -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0; @@ -171,7 +171,7 @@ float4 main() : sv_target return ret; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0; @@ -184,7 +184,7 @@ float4 main() : sv_target return ret; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0; @@ -199,7 +199,7 @@ float4 main() : sv_target return ret; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0;

1 0

Nikolay Sivov : vkd3d-shader: Accept 'loop' attribute, on loops.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: ecdc3f39d4d8b79172cada0a2f35fdd0c6b05e59 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ecdc3f39d4d8b79172cada0a2f35f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 29 01:30:13 2023 +0200 vkd3d-shader: Accept 'loop' attribute, on loops. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 7 +++++-- tests/hlsl/loop.shader_test | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9a1be71e..71c0ae46 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -563,8 +563,11 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, hlsl_warning(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "Loop unrolling is not implemented."); } } - else if (!strcmp(attr->name, "loop") - || !strcmp(attr->name, "fastopt") + else if (!strcmp(attr->name, "loop")) + { + /* TODO: this attribute will be used to disable unrolling, once it's implememented. */ + } + else if (!strcmp(attr->name, "fastopt") || !strcmp(attr->name, "allow_uav_condition")) { hlsl_fixme(ctx, loc, "Unhandled attribute '%s'.", attr->name); diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 6a5240a7..c15e4879 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -102,7 +102,7 @@ todo(sm>=6) draw quad probe all rgba (410.1, 410.1, 410.1, 410.1) % loop attribute by itself -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float ret = 0.0; @@ -116,10 +116,10 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm>=6) draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float ret = 0.0; @@ -135,10 +135,10 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm>=6) draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float ret = 0.0; @@ -154,7 +154,7 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm>=6) draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) % unroll can't be used with fastopt or loop

1 0

Nikolay Sivov : tests: Add some tests for loop attributes.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: b8047fd650edade927f0d95fade06c2aa8924417 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8047fd650edade927f0d95fade06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 28 20:52:46 2023 +0200 tests: Add some tests for loop attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/loop.shader_test | 143 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 4fbf14d8..3d515c9d 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -100,3 +100,146 @@ float4 main() : sv_target uniform 0 float 4.0 todo(sm>=6) draw quad probe all rgba (410.1, 410.1, 410.1, 410.1) + +% loop attribute by itself +[pixel shader todo] +float4 main() : sv_target +{ + float ret = 0.0; + + [loop] for (int i = 0; i < 10; ++i) + { + ret += 1.0; + } + + return ret; +} + +[test] +todo draw quad +probe all rgba (10.0, 10.0, 10.0, 10.0) + +[pixel shader todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] while (i < 10) + { + ret += 1.0; + i++; + } + + return ret; +} + +[test] +todo draw quad +probe all rgba (10.0, 10.0, 10.0, 10.0) + +[pixel shader todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] do + { + i++; + ret += 1.0; + } while (i < 10); + + return ret; +} + +[test] +todo draw quad +probe all rgba (10.0, 10.0, 10.0, 10.0) + +% unroll can't be used with fastopt or loop +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + + [loop] [unroll(1)] for (int i = 0; i < 10; ++i) + { + ret += 1.0; + } + + return ret; +} + +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + + [fastopt] [unroll(1)] for (int i = 0; i < 10; ++i) + { + ret += 1.0; + } + + return ret; +} + +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] [unroll(1)] while (i < 10) + { + ret += 1.0; + i++; + } + + return ret; +} + +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [fastopt] [unroll(1)] while (i < 10) + { + ret += 1.0; + i++; + } + + return ret; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] [unroll(1)] do + { + ret += 1.0; + i++; + } while (i < 10) + + return ret; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [fastopt] [unroll(1)] do + { + ret += 1.0; + i++; + } while (i < 10) + + return ret; +}

1 0

Giovanni Mascellani : tests: Immediately transition buffers after creation in the shader runner.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: c691ad8869abda68038c225c98e5f1bec8b98efa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c691ad8869abda68038c225c98e5f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 31 14:00:35 2023 +0100 tests: Immediately transition buffers after creation in the shader runner. The resource could be destructed before the command list left open is executed; instead, we immediately perform the transition. --- tests/d3d12_test_utils.h | 21 ++++++++++++++++++--- tests/shader_runner_d3d12.c | 7 +++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 3c3e50ca..7473bbc4 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -773,9 +773,10 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); } -#define upload_buffer_data(a, b, c, d, e, f) upload_buffer_data_(__LINE__, a, b, c, d, e, f) -static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer, size_t offset, - size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +#define upload_buffer_data_with_states(a, b, c, d, e, f, g, h) upload_buffer_data_with_states_(__LINE__, a, b, c, d, e, f, g, h) +static inline void upload_buffer_data_with_states_(unsigned int line, ID3D12Resource *buffer, size_t offset, + size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + D3D12_RESOURCE_STATES initial_state, D3D12_RESOURCE_STATES final_state) { ID3D12Resource *upload_buffer; ID3D12Device *device; @@ -786,9 +787,15 @@ static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer upload_buffer = create_upload_buffer_(line, device, size, data); + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, buffer, initial_state, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, buffer, offset, upload_buffer, 0, size); + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, buffer, D3D12_RESOURCE_STATE_COPY_DEST, final_state); + hr = ID3D12GraphicsCommandList_Close(command_list); ok_(line)(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); @@ -798,6 +805,14 @@ static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer ID3D12Device_Release(device); } +#define upload_buffer_data(a, b, c, d, e, f) upload_buffer_data_(__LINE__, a, b, c, d, e, f) +static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer, size_t offset, + size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +{ + return upload_buffer_data_with_states_(line, buffer, offset, size, data, queue, command_list, + RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); +} + static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) { diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 6c71b90f..a05dfd05 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -181,11 +181,10 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_buffer(device, params->data_size, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_buffer_data(resource->resource, 0, params->data_size, resource_data, - test_context->queue, test_context->list); + upload_buffer_data_with_states(resource->resource, 0, params->data_size, resource_data, + test_context->queue, test_context->list, + RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); uav_desc.Format = params->format; uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;

1 0

Giovanni Mascellani : tests: Immediately transition textures after creation in the shader runner.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: 46b7fccfd7e6a08e037d5335225df7f81d170610 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46b7fccfd7e6a08e037d5335225df… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 31 13:53:00 2023 +0100 tests: Immediately transition textures after creation in the shader runner. The resource could be destructed before the command list left open is executed; instead, we immediately perform the transition. --- tests/d3d12_test_utils.h | 28 +++++++++++++++++++++++++--- tests/shader_runner_d3d12.c | 15 +++++++-------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index f0c4b411..3c3e50ca 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -671,10 +671,11 @@ static void copy_sub_resource_data(const D3D12_MEMCPY_DEST *dst, const D3D12_SUB } } -#define upload_texture_data(a, b, c, d, e) upload_texture_data_(__LINE__, a, b, c, d, e) -static inline void upload_texture_data_(unsigned int line, ID3D12Resource *texture, +#define upload_texture_data_with_states(a, b, c, d, e, f, g) upload_texture_data_with_states_(__LINE__, a, b, c, d, e, f, g) +static inline void upload_texture_data_with_states_(unsigned int line, ID3D12Resource *texture, const D3D12_SUBRESOURCE_DATA *data, unsigned int sub_resource_count, - ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) + ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + D3D12_RESOURCE_STATES initial_state, D3D12_RESOURCE_STATES final_state) { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts; @@ -718,7 +719,13 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu if (resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, texture, initial_state, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyResource(command_list, texture, upload_buffer); + + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, texture, D3D12_RESOURCE_STATE_COPY_DEST, final_state); } else { @@ -732,8 +739,14 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; src_location.PlacedFootprint = layouts[i]; + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, texture, i, initial_state, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); + + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, texture, i, D3D12_RESOURCE_STATE_COPY_DEST, final_state); } } @@ -751,6 +764,15 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu free(row_sizes); } +#define upload_texture_data(a, b, c, d, e) upload_texture_data_(__LINE__, a, b, c, d, e) +static inline void upload_texture_data_(unsigned int line, ID3D12Resource *texture, + const D3D12_SUBRESOURCE_DATA *data, unsigned int sub_resource_count, + ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +{ + return upload_texture_data_with_states_(line, texture, data, sub_resource_count, queue, command_list, + RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); +} + #define upload_buffer_data(a, b, c, d, e, f) upload_buffer_data_(__LINE__, a, b, c, d, e, f) static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer, size_t offset, size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 79d637e6..6c71b90f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -147,11 +147,11 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, params->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); - upload_texture_data(resource->resource, resource_data, - params->level_count, test_context->queue, test_context->list); - reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, D3D12_RESOURCE_STATE_COPY_DEST, + upload_texture_data_with_states(resource->resource, resource_data, + params->level_count, test_context->queue, test_context->list, + RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + reset_command_list(test_context->list, test_context->allocator); ID3D12Device_CreateShaderResourceView(device, resource->resource, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; @@ -163,11 +163,10 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_texture_data(resource->resource, resource_data, - params->level_count, test_context->queue, test_context->list); + upload_texture_data_with_states(resource->resource, resource_data, + params->level_count, test_context->queue, test_context->list, + RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); ID3D12Device_CreateUnorderedAccessView(device, resource->resource, NULL, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); break;

1 0