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

Zebediah Figura : tests: Make the "texture" structure more generic.
by Alexandre Julliard 22 Mar '22

22 Mar '22

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

Zebediah Figura : tests: Allow specifying a custom vertex buffer.
by Alexandre Julliard 22 Mar '22

22 Mar '22

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: Specify the vertex count from the shader runner frontend.
by Alexandre Julliard 22 Mar '22

22 Mar '22

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: Specify the primitive type from the shader runner frontend.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: c7623262cc5c5fb4d8df0f22e546c1e7da13f0a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7623262cc5c5fb4d8df0f2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:20 2022 -0500 tests: Specify the primitive type 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 | 5 +++-- tests/shader_runner_d3d12.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 04819c7d..c3f967a2 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(runner, 3); + runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); } else if (match_string(line, "probe all rgba", &line)) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 7e29873c..a98917c5 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)(struct shader_runner *runner, unsigned int vertex_count); + void (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, 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 f2181ffc..93904a64 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -423,7 +423,8 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d11_runner_draw(struct shader_runner *r, unsigned int vertex_count) +static void d3d11_runner_draw(struct shader_runner *r, + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11DeviceContext *context = runner->immediate_context; @@ -525,7 +526,7 @@ static void d3d11_runner_draw(struct shader_runner *r, unsigned int vertex_count ID3D11InputLayout_Release(input_layout); } - ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D11DeviceContext_IASetPrimitiveTopology(context, primitive_topology); ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 2dda6a75..06221691 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -132,7 +132,8 @@ static void d3d12_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d12_runner_draw(struct shader_runner *r, unsigned int vertex_count) +static void d3d12_runner_draw(struct shader_runner *r, + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; @@ -291,7 +292,7 @@ static void d3d12_runner_draw(struct shader_runner *r, unsigned int vertex_count ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &test_context->rtv, false, NULL); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &test_context->scissor_rect); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &test_context->viewport); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, primitive_topology); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, test_context->rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0);

1 0

Zebediah Figura : tests: Add a test for the "nointerpolation" modifier.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: 24a27daf98d3a2a31a4dcc02cde89d61eca7da04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=24a27daf98d3a2a31a4dcc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:21 2022 -0500 tests: Add a test for the "nointerpolation" modifier. 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> --- Makefile.am | 2 ++ tests/nointerpolation.shader_test | 27 +++++++++++++++++++++++++++ tests/shader_runner.c | 17 +++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/Makefile.am b/Makefile.am index f2c8440c..64cfe534 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/nointerpolation.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ @@ -351,6 +352,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/max.shader_test \ + tests/nointerpolation.shader_test \ tests/sampler-offset.shader_test \ tests/trigonometry.shader_test endif diff --git a/tests/nointerpolation.shader_test b/tests/nointerpolation.shader_test new file mode 100644 index 00000000..8f15be6e --- /dev/null +++ b/tests/nointerpolation.shader_test @@ -0,0 +1,27 @@ +[require] +shader model >= 4.0 + +[input layout] +0 r32g32b32a32 float texcoord + +[vertex buffer 0] +0.0 1.0 0.0 1.0 +1.0 0.0 0.0 1.0 +0.0 0.0 1.0 1.0 + +[vertex shader] +void main(uint id : sv_vertexid, nointerpolation inout float4 t : texcoord, out float4 pos : sv_position) +{ + float2 coords = float2((id << 1) & 2, id & 2); + pos = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1); +} + +[pixel shader] +float4 main(nointerpolation float4 t : texcoord) : sv_target +{ + return t; +} + +[test] +draw triangle list 3 +probe all rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index c3f967a2..99f2a22f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -336,6 +336,23 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); } + else if (match_string(line, "draw", &line)) + { + D3D_PRIMITIVE_TOPOLOGY topology; + unsigned int vertex_count; + char *rest; + + if (match_string(line, "triangle list", &line)) + topology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST; + else + fatal_error("Unknown primitive topology '%s'.\n", line); + + vertex_count = strtoul(line, &rest, 10); + if (line == rest) + fatal_error("Malformed vertex count '%s'.\n", line); + + runner->ops->draw(runner, topology, vertex_count); + } else if (match_string(line, "probe all rgba", &line)) { static const RECT rect = {0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT};

1 0

Francois Gouget : winetest: Fix a minor license format issue in pattern.js.
by Alexandre Julliard 22 Mar '22

22 Mar '22

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/cgi: Don't show autoincrement fields of new items.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: tools Branch: master Commit: 0a18c4e022589dabd375a51f5c979a296f180f83 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0a18c4e022589dabd375a51… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:15:17 2022 +0100 testbot/cgi: Don't show autoincrement fields of new items. They don't have a value yet and cannot be edited. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9401154..a178aa6 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -99,13 +99,16 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $Display = $self->SUPER::DisplayProperty($PropertyDescriptor); - if ($Display eq "rw" && ! $self->{Item}->GetIsNew() && - $PropertyDescriptor->GetIsKey()) - { - $Display = ""; - } - - return $Display; + return # Don't show autoincrement fields of new items: they don't have a + # value yet and cannot be edited anyway so there is no point. + ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "S" and + $self->{Item}->GetIsNew()) ? "" : + # Don't allow editing key attributes of existing items. Furthermore + # the item is identified in the page title so hide them altogether. + ($PropertyDescriptor->GetIsKey() and !$self->{Item}->GetIsNew() and + $Display eq "rw") ? "" : + $Display; } sub GetActions($)

1 0

Francois Gouget : testbot/cgi: Better select which FormPage fields can be shown / edited.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: tools Branch: master Commit: bcab71a7c81db6ec8a285d0ec761c1b295650fea URL: https://source.winehq.org/git/tools.git/?a=commit;h=bcab71a7c81db6ec8a285d0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:15:26 2022 +0100 testbot/cgi: Better select which FormPage fields can be shown / edited. Also better document why each type of field can or cannot be edited / shown. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 3ac6223..e432fcb 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -208,6 +208,8 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; + # Note: Editing Detailrefs and Itemrefs is not supported which leaves only + # Basic and Enum property descriptors here. return $PropertyDescriptor->GetClass() eq "Enum" ? "select" : $PropertyDescriptor->GetType() eq "B" ? "checkbox" : $PropertyDescriptor->GetType() eq "textarea" ? "textarea" : @@ -331,12 +333,20 @@ sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetClass() eq "Detailref") - { - return ""; - } - - return "rw"; + return # Detailref fields point to a Collection of objects matching the + # primary key of this form data. As such they can neither be shown + # nor edited. + $PropertyDescriptor->GetClass() eq "Detailref" ? "" : + # Itemref fields are keys identifying other objects and thus would + # require careful validation if edited. Requiring users to manually + # type the appropriate key value would also be cumbersome so this is + # currently not supported. But they can be displayed. + $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : + # All other properties can be edited... + $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : + $PropertyDescriptor->GetType() ne "S" ? "rw" : + # ...except autoincrement ones (shown as <unset> if undefined) + "ro"; } sub GetActions($)

1 0

Francois Gouget : testbot/web: Better document the default Hours log page value.
by Alexandre Julliard 22 Mar '22

22 Mar '22

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 22 Mar '22

22 Mar '22

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