March 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : tests: Specify the default vertex shader in the shader runner frontend.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: vkd3d Branch: master Commit: 16b383aef58974bd1f5bb9649e7730068c2601b0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16b383aef58974bd1f5bb96… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:15 2022 -0500 tests: Specify the default vertex shader in the shader runner frontend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 10 +++++++++ tests/shader_runner_d3d11.c | 54 +++++++++++++++++++-------------------------- tests/shader_runner_d3d12.c | 16 +++++--------- 3 files changed, 39 insertions(+), 41 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 033fee0a..a2aecf9f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -290,6 +290,16 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { + static const char vs_source[] = + "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" + "{\n" + " float2 coords = float2((id << 1) & 2, id & 2);\n" + " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" + "}"; + + if (!runner->vs_source) + runner->vs_source = strdup(vs_source); + runner->ops->draw_quad(runner); } else if (match_string(line, "probe all rgba", &line)) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index fb73f80e..f4049444 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -61,8 +61,6 @@ struct d3d11_shader_runner ID3D11Texture2D *rt; ID3D11RenderTargetView *rtv; ID3D11DeviceContext *immediate_context; - - ID3D11VertexShader *vs; }; static struct d3d11_shader_runner *d3d11_shader_runner(struct shader_runner *r) @@ -74,11 +72,22 @@ static bool enable_debug_layer; static bool use_warp_adapter; static unsigned int use_adapter_idx; -static ID3D10Blob *compile_shader(const char *source, const char *profile) +static ID3D10Blob *compile_shader(const char *source, const char *type, enum shader_model shader_model) { ID3D10Blob *blob = NULL, *errors = NULL; + char profile[7]; HRESULT hr; + static const char *const shader_models[] = + { + [SHADER_MODEL_2_0] = "4_0", + [SHADER_MODEL_4_0] = "4_0", + [SHADER_MODEL_4_1] = "4_1", + [SHADER_MODEL_5_0] = "5_0", + [SHADER_MODEL_5_1] = "5_1", + }; + + sprintf(profile, "%s_%s", type, shader_models[shader_model]); hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) @@ -323,9 +332,6 @@ static void destroy_test_context(struct d3d11_shader_runner *runner) { ULONG ref; - if (runner->vs) - ID3D11VertexShader_Release(runner->vs); - ID3D11DeviceContext_Release(runner->immediate_context); ID3D11RenderTargetView_Release(runner->rtv); ID3D11Texture2D_Release(runner->rt); @@ -405,43 +411,28 @@ static void d3d11_runner_destroy_texture(struct shader_runner *r, struct texture static void d3d11_runner_draw_quad(struct shader_runner *r) { - static const char vs_source[] = - "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" - "{\n" - " float2 coords = float2((id << 1) & 2, id & 2);\n" - " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" - "}"; - struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11Device *device = runner->device; + ID3D10Blob *vs_code, *ps_code; ID3D11Buffer *cb = NULL; + ID3D11VertexShader *vs; ID3D11PixelShader *ps; - ID3D10Blob *ps_code; unsigned int i; HRESULT hr; - static const char *const ps_profiles[] = - { - [SHADER_MODEL_2_0] = "ps_4_0", - [SHADER_MODEL_4_0] = "ps_4_0", - [SHADER_MODEL_4_1] = "ps_4_1", - [SHADER_MODEL_5_0] = "ps_5_0", - [SHADER_MODEL_5_1] = "ps_5_1", - }; - - if (!(ps_code = compile_shader(runner->r.ps_source, ps_profiles[runner->r.minimum_shader_model]))) + if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) return; - if (!runner->vs) + if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) { - ID3D10Blob *vs_code = compile_shader(runner->r.vs_source ? runner->r.vs_source : vs_source, "vs_4_0"); - - hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), - ID3D10Blob_GetBufferSize(vs_code), NULL, &runner->vs); - ok(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); ID3D10Blob_Release(vs_code); + return; } + hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), + ID3D10Blob_GetBufferSize(vs_code), NULL, &vs); + ok(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), ID3D10Blob_GetBufferSize(ps_code), NULL, &ps); ok(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); @@ -482,12 +473,13 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) } ID3D11DeviceContext_IASetPrimitiveTopology(runner->immediate_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D11DeviceContext_VSSetShader(runner->immediate_context, runner->vs, NULL, 0); + ID3D11DeviceContext_VSSetShader(runner->immediate_context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(runner->immediate_context, ps, NULL, 0); ID3D11DeviceContext_Draw(runner->immediate_context, 3, 0); ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); if (cb) ID3D11Buffer_Release(cb); } diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index e124922f..befa7f2f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -133,8 +133,8 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12CommandQueue *queue = test_context->queue; D3D12_STATIC_SAMPLER_DESC static_samplers[1]; ID3D12Device *device = test_context->device; - ID3D10Blob *vs_code = NULL, *ps_code; static const float clear_color[4]; + ID3D10Blob *vs_code, *ps_code; D3D12_SHADER_BYTECODE vs, ps; unsigned int uniform_index; ID3D12PipelineState *pso; @@ -144,7 +144,7 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) return; - if (runner->r.vs_source && !(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) + if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) { ID3D10Blob_Release(ps_code); return; @@ -209,17 +209,13 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) hr = create_root_signature(device, &root_signature_desc, &test_context->root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - if (vs_code) - { - vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); - vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); - } + vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); + vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); ps.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); ps.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso = create_pipeline_state(device, test_context->root_signature, - test_context->render_target_desc.Format, vs_code ? &vs : NULL, &ps, NULL); - if (vs_code) - ID3D10Blob_Release(vs_code); + test_context->render_target_desc.Format, &vs, &ps, NULL); + ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); if (!pso) return;

1 0

Zebediah Figura : tests: Add support for running shader tests with a custom vertex shader.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: vkd3d Branch: master Commit: 52223250d7d88590e8c02f542792e9f78723c4c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52223250d7d88590e8c02f5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:14 2022 -0500 tests: Add support for running shader tests with a custom vertex shader. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 15 +++++++++++++++ tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 2 +- tests/shader_runner_d3d12.c | 38 ++++++++++++++++++++++++++------------ 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 910e6ecd..033fee0a 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -80,6 +80,7 @@ enum parse_state STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, + STATE_SHADER_VERTEX, STATE_TEXTURE, STATE_TEST, }; @@ -501,6 +502,14 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const shader_source_size = 0; break; + case STATE_SHADER_VERTEX: + free(runner->vs_source); + runner->vs_source = shader_source; + shader_source = NULL; + shader_source_len = 0; + shader_source_size = 0; + break; + case STATE_SHADER_INVALID_PIXEL: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -639,6 +648,10 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { state = STATE_PREPROC_INVALID; } + else if (!strcmp(line, "[vertex shader]\n")) + { + state = STATE_SHADER_VERTEX; + } vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } @@ -654,6 +667,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC_INVALID: case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: + case STATE_SHADER_VERTEX: { size_t len = strlen(line); @@ -682,6 +696,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const } } + free(runner->vs_source); free(runner->ps_source); for (i = 0; i < runner->texture_count; ++i) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 26fa2367..43ded853 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -72,6 +72,7 @@ struct shader_runner { const struct shader_runner_ops *ops; + char *vs_source; char *ps_source; enum shader_model minimum_shader_model; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index c077718c..fb73f80e 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -434,7 +434,7 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) if (!runner->vs) { - ID3D10Blob *vs_code = compile_shader(vs_source, "vs_4_0"); + ID3D10Blob *vs_code = compile_shader(runner->r.vs_source ? runner->r.vs_source : vs_source, "vs_4_0"); hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), NULL, &runner->vs); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 4f077b38..e124922f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -52,22 +52,23 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } -static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) +static ID3D10Blob *compile_shader(const char *source, const char *type, enum shader_model shader_model) { ID3D10Blob *blob = NULL, *errors = NULL; + char profile[7]; HRESULT hr; static const char *const shader_models[] = { - [SHADER_MODEL_2_0] = "ps_4_0", - [SHADER_MODEL_4_0] = "ps_4_0", - [SHADER_MODEL_4_1] = "ps_4_1", - [SHADER_MODEL_5_0] = "ps_5_0", - [SHADER_MODEL_5_1] = "ps_5_1", + [SHADER_MODEL_2_0] = "4_0", + [SHADER_MODEL_4_0] = "4_0", + [SHADER_MODEL_4_1] = "4_1", + [SHADER_MODEL_5_0] = "5_0", + [SHADER_MODEL_5_1] = "5_1", }; - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", - shader_models[shader_model], 0, 0, &blob, &errors); + sprintf(profile, "%s_%s", type, shader_models[shader_model]); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); if (errors) { @@ -132,17 +133,23 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12CommandQueue *queue = test_context->queue; D3D12_STATIC_SAMPLER_DESC static_samplers[1]; ID3D12Device *device = test_context->device; + ID3D10Blob *vs_code = NULL, *ps_code; static const float clear_color[4]; + D3D12_SHADER_BYTECODE vs, ps; unsigned int uniform_index; - D3D12_SHADER_BYTECODE ps; ID3D12PipelineState *pso; - ID3D10Blob *ps_code; HRESULT hr; size_t i; - if (!(ps_code = compile_shader(runner->r.ps_source, runner->r.minimum_shader_model))) + if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) return; + if (runner->r.vs_source && !(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) + { + ID3D10Blob_Release(ps_code); + return; + } + root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = root_params; root_signature_desc.NumStaticSamplers = 0; @@ -202,10 +209,17 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) hr = create_root_signature(device, &root_signature_desc, &test_context->root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + if (vs_code) + { + vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); + vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); + } ps.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); ps.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso = create_pipeline_state(device, test_context->root_signature, - test_context->render_target_desc.Format, NULL, &ps, NULL); + test_context->render_target_desc.Format, vs_code ? &vs : NULL, &ps, NULL); + if (vs_code) + ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); if (!pso) return;

1 0

Zebediah Figura : tests: Specify the vertex count from the shader runner frontend.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: vkd3d Branch: master Commit: 492cd135e3f25ad627389c12f99d7a07ced29d1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=492cd135e3f25ad627389c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:19 2022 -0500 tests: Specify the vertex count from the shader runner frontend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 2 +- tests/shader_runner.h | 2 +- tests/shader_runner_d3d11.c | 6 +++--- tests/shader_runner_d3d12.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index b564a8a5..04819c7d 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -334,7 +334,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->ops->draw_quad(runner); + runner->ops->draw(runner, 3); } else if (match_string(line, "probe all rgba", &line)) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index dd692b5c..7e29873c 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -112,7 +112,7 @@ struct shader_runner_ops { struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); - void (*draw_quad)(struct shader_runner *runner); + void (*draw)(struct shader_runner *runner, unsigned int vertex_count); void (*probe_vec4)(struct shader_runner *runner, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 5b20d22d..f2181ffc 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -423,7 +423,7 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d11_runner_draw_quad(struct shader_runner *r) +static void d3d11_runner_draw(struct shader_runner *r, unsigned int vertex_count) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11DeviceContext *context = runner->immediate_context; @@ -529,7 +529,7 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_Draw(context, 3, 0); + ID3D11DeviceContext_Draw(context, vertex_count, 0); ID3D11PixelShader_Release(ps); ID3D11VertexShader_Release(vs); @@ -611,7 +611,7 @@ static const struct shader_runner_ops d3d11_runner_ops = { .create_resource = d3d11_runner_create_resource, .destroy_resource = d3d11_runner_destroy_resource, - .draw_quad = d3d11_runner_draw_quad, + .draw = d3d11_runner_draw, .probe_vec4 = d3d11_runner_probe_vec4, }; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 588964b5..2dda6a75 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -132,7 +132,7 @@ static void d3d12_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d12_runner_draw_quad(struct shader_runner *r) +static void d3d12_runner_draw(struct shader_runner *r, unsigned int vertex_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; @@ -294,7 +294,7 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, test_context->rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0); transition_resource_state(command_list, test_context->render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); @@ -324,7 +324,7 @@ static const struct shader_runner_ops d3d12_runner_ops = { .create_resource = d3d12_runner_create_resource, .destroy_resource = d3d12_runner_destroy_resource, - .draw_quad = d3d12_runner_draw_quad, + .draw = d3d12_runner_draw, .probe_vec4 = d3d12_runner_probe_vec4, };

1 0

Zebediah Figura : tests: Allow specifying a custom vertex buffer.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: vkd3d Branch: master Commit: 84c73f82f72e8843e11a42733eda365b69b911df URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=84c73f82f72e8843e11a427… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:18 2022 -0500 tests: Allow specifying a custom vertex buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 31 +++++++++++++++++++++++++++++++ tests/shader_runner.h | 5 +++++ tests/shader_runner_d3d11.c | 23 ++++++++++++++++++----- tests/shader_runner_d3d12.c | 17 +++++++++++++++++ 4 files changed, 71 insertions(+), 5 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f203e453..b564a8a5 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -85,6 +85,7 @@ enum parse_state STATE_SHADER_VERTEX, STATE_TEXTURE, STATE_TEST, + STATE_VERTEX_BUFFER, }; static bool match_string(const char *line, const char *token, const char **const rest) @@ -478,6 +479,24 @@ static void set_resource(struct shader_runner *runner, struct resource *resource runner->resources[runner->resource_count++] = resource; } +unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot) +{ + unsigned int stride = 0; + size_t i; + + /* We currently don't deal with vertex formats less than 32 bits, so don't + * bother with alignment. */ + for (i = 0; i < runner->input_element_count; ++i) + { + const struct input_element *element = &runner->input_elements[i]; + + if (element->slot == slot) + stride += element->texel_size; + } + + return stride; +} + void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops) { size_t shader_source_size = 0, shader_source_len = 0; @@ -534,6 +553,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const break; case STATE_TEXTURE: + case STATE_VERTEX_BUFFER: set_resource(runner, runner->ops->create_resource(runner, &current_resource)); free(current_resource.data); break; @@ -681,6 +701,16 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const current_resource.data_type = TEXTURE_DATA_FLOAT; current_resource.texel_size = 16; } + else if (sscanf(line, "[vertex buffer %u]\n", &index)) + { + state = STATE_VERTEX_BUFFER; + + memset(&current_resource, 0, sizeof(current_resource)); + + current_resource.slot = index; + current_resource.type = RESOURCE_TYPE_VERTEX_BUFFER; + current_resource.data_type = TEXTURE_DATA_FLOAT; + } else if (!strcmp(line, "[test]\n")) { state = STATE_TEST; @@ -743,6 +773,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const break; case STATE_TEXTURE: + case STATE_VERTEX_BUFFER: parse_resource_directive(&current_resource, line); break; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 67944fda..dd692b5c 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -54,6 +54,7 @@ struct sampler enum resource_type { RESOURCE_TYPE_TEXTURE, + RESOURCE_TYPE_VERTEX_BUFFER, }; struct resource_params @@ -73,6 +74,8 @@ struct resource { unsigned int slot; enum resource_type type; + + unsigned int size; }; struct input_element @@ -115,6 +118,8 @@ struct shader_runner_ops void fatal_error(const char *format, ...) VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2); +unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot); + void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops); #ifdef _WIN32 diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 838e04ff..5b20d22d 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -42,7 +42,7 @@ struct d3d11_resource { struct resource r; - ID3D11Texture2D *texture; + ID3D11Resource *resource; ID3D11ShaderResourceView *srv; }; @@ -397,12 +397,17 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co resource_data.SysMemPitch = params->width * params->texel_size; resource_data.SysMemSlicePitch = params->height * resource_data.SysMemPitch; - hr = ID3D11Device_CreateTexture2D(device, &desc, &resource_data, &resource->texture); + hr = ID3D11Device_CreateTexture2D(device, &desc, &resource_data, (ID3D11Texture2D **)&resource->resource); ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); - hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)resource->texture, NULL, &resource->srv); + hr = ID3D11Device_CreateShaderResourceView(device, resource->resource, NULL, &resource->srv); ok(hr == S_OK, "Failed to create shader resource view, hr %#lx.\n", hr); break; } + + case RESOURCE_TYPE_VERTEX_BUFFER: + resource->resource = (ID3D11Resource *)create_buffer(device, + D3D11_BIND_VERTEX_BUFFER, params->data_size, params->data); + break; } return &resource->r; @@ -412,8 +417,9 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour { struct d3d11_resource *resource = d3d11_resource(res); - ID3D11Texture2D_Release(resource->texture); - ID3D11ShaderResourceView_Release(resource->srv); + ID3D11Resource_Release(resource->resource); + if (resource->srv) + ID3D11ShaderResourceView_Release(resource->srv); free(resource); } @@ -456,12 +462,19 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) for (i = 0; i < runner->r.resource_count; ++i) { struct d3d11_resource *resource = d3d11_resource(runner->r.resources[i]); + unsigned int stride = get_vb_stride(&runner->r, resource->r.slot); + unsigned int offset = 0; switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: ID3D11DeviceContext_PSSetShaderResources(context, resource->r.slot, 1, &resource->srv); break; + + case RESOURCE_TYPE_VERTEX_BUFFER: + ID3D11DeviceContext_IASetVertexBuffers(context, resource->r.slot, 1, + (ID3D11Buffer **)&resource->resource, &stride, &offset); + break; } } diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 1d38ee90..588964b5 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -92,6 +92,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource = calloc(1, sizeof(*resource)); resource->r.slot = params->slot; resource->r.type = params->type; + resource->r.size = params->data_size; switch (params->type) { @@ -114,6 +115,10 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co ID3D12Device_CreateShaderResourceView(device, resource->resource, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; + + case RESOURCE_TYPE_VERTEX_BUFFER: + resource->resource = create_upload_buffer(device, params->data_size, params->data); + break; } return &resource->r; @@ -197,6 +202,9 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) range->RegisterSpace = 0; range->OffsetInDescriptorsFromTableStart = 0; break; + + case RESOURCE_TYPE_VERTEX_BUFFER: + break; } } @@ -261,6 +269,7 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) for (i = 0; i < runner->r.resource_count; ++i) { struct d3d12_resource *resource = d3d12_resource(runner->r.resources[i]); + D3D12_VERTEX_BUFFER_VIEW vbv; switch (resource->r.type) { @@ -268,6 +277,14 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, resource->root_index, get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; + + case RESOURCE_TYPE_VERTEX_BUFFER: + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(resource->resource); + vbv.StrideInBytes = get_vb_stride(&runner->r, resource->r.slot); + vbv.SizeInBytes = resource->r.size; + + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, resource->r.slot, 1, &vbv); + break; } }

1 0

Zebediah Figura : tests: Make the "texture" structure more generic.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: vkd3d Branch: master Commit: f11f7032cd4ed46b615e222bb90cdcbc6b55fb46 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f11f7032cd4ed46b615e222… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:17 2022 -0500 tests: Make the "texture" structure more generic. Use it to hold any type of resource, regardless of type and binding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 55 ++++++++++---------- tests/shader_runner.h | 19 ++++--- tests/shader_runner_d3d11.c | 89 ++++++++++++++++++-------------- tests/shader_runner_d3d12.c | 123 +++++++++++++++++++++++++------------------- 4 files changed, 161 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f11f7032cd4ed46b615…

1 0

Francois Gouget : testbot/web: Better document the default Hours log page value.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: 22e64592a8af717408d240329a0d5123580db029 URL: https://source.winehq.org/git/tools.git/?a=commit;h=22e64592a8af717408d2403… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:20:01 2022 +0100 testbot/web: Better document the default Hours log page value. Store it in a variable at the start of the file so it's easy to spot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/Log.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index ddc655f..8d3a8ce 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -28,6 +28,8 @@ use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Log; +my $HOURS_DEFAULT = 1; + sub _initialize($$$) { @@ -41,7 +43,7 @@ sub _initialize($$$) if (!$self->GetParam("Hours") or !$self->Validate() or !int($self->GetParam("Hours"))) # 00 case! { - $self->SetParam("Hours", 1) if (!defined $self->{ErrMessage}); + $self->SetParam("Hours", $HOURS_DEFAULT) if (!defined $self->{ErrMessage}); $self->SetParam("Action", undef); } }

1 0

Francois Gouget : testbot/web: Better initialize and check the Hours activity page parameter.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: 6a634e007bf9c2d8759d42d9fe7770364fd7a68f URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a634e007bf9c2d8759d42d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:20:27 2022 +0100 testbot/web: Better initialize and check the Hours activity page parameter. Set the FormPage property descriptors list. This allows FormPage::Validate() to do most of the validation work. Treat "00" the same as "0". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 9444779..272215f 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -27,28 +27,35 @@ our @ISA = qw(ObjectModel::CGI::FreeFormPage); use POSIX qw(strftime); use URI::Escape; +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs; - my $HOURS_DEFAULT = 12; + sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; $self->{start} = Time(); - $self->{hours} = $self->GetParam("Hours"); - if (!defined $self->{hours} or $self->{hours} !~ /^\d{1,3}$/) - { - $self->{hours} = $HOURS_DEFAULT; - } - + my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 3), + ); $self->SUPER::_initialize($Request, $RequiredRole); $self->{Method} = "get"; + + if (!$self->GetParam("Hours") or !$self->Validate() or + !int($self->GetParam("Hours"))) # 00 case! + { + # This page always needs a valid value to calculate the cutoff. So just + # replace invalid values with the default (no error message is shown + # either). + $self->SetParam("Hours", $HOURS_DEFAULT); + } } sub GetPageTitle($$) @@ -61,7 +68,8 @@ sub GetPageTitle($$) sub GeneratePage($) { my ($self) = @_; - if ($self->{hours} and $self->{hours} <= $HOURS_DEFAULT) + + if ($self->GetParam("Hours") <= $HOURS_DEFAULT) { $self->{Request}->headers_out->add("Refresh", "60"); } @@ -101,7 +109,7 @@ sub GenerateBody($) # Generate a custom form to let the user specify the Hours field. $self->GenerateFormStart(); - print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</label></div>\n"; + print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='", $self->GetParam("Hours"), "'/></div> hours.</label></div>\n"; $self->GenerateFormEnd(); print "<h1>${ProjectName} Test Bot activity</h1>\n"; @@ -148,7 +156,7 @@ EOF ### Generate the HTML table with the newest record first print "<tbody>\n"; - my ($Activity, $_Counters) = GetActivity($VMs, $self->{hours} * 3600); + my ($Activity, $_Counters) = GetActivity($VMs, $self->GetParam("Hours") * 3600); for (my $Index = @$Activity; $Index--; ) { my $Group = $Activity->[$Index];

1 0

Francois Gouget : testbot/web: Only refresh the main page for small valid Days values.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: 9992a28e49aeb1c137d16561c2508ba0a9757e02 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9992a28e49aeb1c137d1656… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:21:30 2022 +0100 testbot/web: Only refresh the main page for small valid Days values. If Days is invalid every refresh would pop up the error dialog. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 605e23b..451258e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -284,8 +284,10 @@ sub GeneratePage($) { my ($self) = @_; - $self->{Request}->headers_out->add("Refresh", "60"); - + if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) + { + $self->{Request}->headers_out->add("Refresh", "60"); + } $self->SUPER::GeneratePage(); }

1 0

Francois Gouget : winetest: Fix a minor license format issue in pattern.js.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: 32d395ef14d4ee5284971669d92239eca881e7ed URL: https://source.winehq.org/git/tools.git/?a=commit;h=32d395ef14d4ee528497166… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:14:41 2022 +0100 winetest: Fix a minor license format issue in pattern.js. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/patterns.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/patterns.js b/winetest/patterns.js index be583a5..042620b 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ "use strict";

1 0

Francois Gouget : testbot/web: Remove a dependency on FormPage::SaveProperties() in VMDetails.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: a35edaa2ee5e2e1813eabd634f3647b8d7f498ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=a35edaa2ee5e2e1813eabd6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:21:43 2022 +0100 testbot/web: Remove a dependency on FormPage::SaveProperties() in VMDetails. Save() is already calling SaveProperties() to store the form fields in the $VM object. Just make sure to check the old value of $VM->Errors before it is ovewritten. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/VMDetails.pl | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 19983c6..f39b0d6 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -48,23 +48,21 @@ sub Save($) { my ($self) = @_; - my $OldStatus = $self->{Item}->Status || ""; - return !1 if (!$self->SaveProperties()); - - if ($OldStatus ne $self->{Item}->Status) + my $ResetErrors; + if (($self->GetParam("Status") || "") ne $self->{Item}->Status) { # The administrator action resets the consecutive error count $self->{Item}->Errors(undef); - my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate(); - if (!defined $ErrMessage) - { - $self->{Item}->RecordStatus(undef, $self->{Item}->Status ." administrator"); - } + $ResetErrors = 1; } - my $ErrKey; - ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return ! defined($self->{ErrMessage}); + return undef if (!$self->SUPER::Save()); + + if ($ResetErrors) + { + $self->{Item}->RecordStatus(undef, $self->{Item}->Status ." administrator"); + } + return 1; } sub GenerateFooter($)

1 0