October 2021 - Wine-commits

Henri Verbeet : vkd3d-shader/sm4: Store the message context pointer in the vkd3d_shader_parser structure.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: vkd3d Branch: master Commit: aca39afd7305f47e43a4af3c7f027a24d5c47463 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aca39afd7305f47e43a4af3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 17:51:14 2021 +0200 vkd3d-shader/sm4: Store the message context pointer in the vkd3d_shader_parser structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 26 +++++++++++++------------- libs/vkd3d-shader/vkd3d_shader_main.c | 7 +++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b93d618..cc5b1b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -97,7 +97,6 @@ struct vkd3d_shader_sm4_parser struct list src; struct vkd3d_shader_immediate_constant_buffer icb; - struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_parser p; }; @@ -176,13 +175,13 @@ static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4) return version->major >= 5 && version->minor >= 1; } -static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *priv, +static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *sm4, enum vkd3d_shader_error error, const char *format, ...) { va_list args; va_start(args, format); - vkd3d_shader_verror(priv->message_context, NULL, error, format, args); + vkd3d_shader_verror(sm4->p.message_context, NULL, error, format, args); va_end(args); } @@ -974,6 +973,7 @@ static enum vkd3d_data_type map_data_type(char t) static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { + struct vkd3d_shader_version version; uint32_t version_token, token_count; unsigned int i; @@ -1000,34 +1000,36 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t switch (version_token >> 16) { case VKD3D_SM4_PS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_PIXEL; + version.type = VKD3D_SHADER_TYPE_PIXEL; break; case VKD3D_SM4_VS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_VERTEX; + version.type = VKD3D_SHADER_TYPE_VERTEX; break; case VKD3D_SM4_GS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; + version.type = VKD3D_SHADER_TYPE_GEOMETRY; break; case VKD3D_SM5_HS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_HULL; + version.type = VKD3D_SHADER_TYPE_HULL; break; case VKD3D_SM5_DS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; + version.type = VKD3D_SHADER_TYPE_DOMAIN; break; case VKD3D_SM5_CS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; + version.type = VKD3D_SHADER_TYPE_COMPUTE; break; default: FIXME("Unrecognised shader type %#x.\n", version_token >> 16); } - sm4->p.shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); - sm4->p.shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + version.major = VKD3D_SM4_VERSION_MAJOR(version_token); + version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + + vkd3d_shader_parser_init(&sm4->p, message_context, &version); sm4->p.ptr = sm4->start; memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); @@ -1047,8 +1049,6 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t list_init(&sm4->src_free); list_init(&sm4->src); - sm4->message_context = message_context; - return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8185e12..9f8dd76 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -362,6 +362,13 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version) +{ + parser->message_context = message_context; + parser->shader_version = *version; +} + static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { shader_sm4_free(parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4364ba9..db87c16 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -889,11 +889,16 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg struct vkd3d_shader_parser { + struct vkd3d_shader_message_context *message_context; + struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version; const uint32_t *ptr; }; +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version); + void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type);

1 0

Henri Verbeet : vkd3d-shader/sm4: Maintain the parser location in the vkd3d_shader_parser structure.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: vkd3d Branch: master Commit: 18e838a1cc857ce36a576c4a923bdf9f526b2c19 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=18e838a1cc857ce36a576c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 17:51:15 2021 +0200 vkd3d-shader/sm4: Maintain the parser location in the vkd3d_shader_parser structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 11 +++++++---- libs/vkd3d-shader/glsl.c | 14 ++++---------- libs/vkd3d-shader/spirv.c | 10 ++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 13 +++++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 21 +++++++++++---------- 5 files changed, 35 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=18e838a1cc857ce36a5…

1 0

Zebediah Figura : vkd3d-shader/hlsl: SM4 immediate constants do not have a register index.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: vkd3d Branch: master Commit: ded7b381e54a469bb55031e2a53876d463f52114 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ded7b381e54a469bb55031e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 3 19:19:05 2021 -0500 vkd3d-shader/hlsl: SM4 immediate constants do not have a register index. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f724943..328a8ba 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -961,8 +961,6 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; - instr.srcs[0].reg.idx[0] = constant->reg.id; - instr.srcs[0].reg.idx_count = 1; for (i = 0; i < dimx; ++i) instr.srcs[0].reg.immconst_uint[i] = constant->value[i].u; instr.src_count = 1,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of hlsl_type_is_void().
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: vkd3d Branch: master Commit: 12acfd97240a9264d28f1c9acca5dbb678e44c88 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12acfd97240a9264d28f1c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 3 19:19:06 2021 -0500 vkd3d-shader/hlsl: Get rid of hlsl_type_is_void(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 7 +------ libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 66ca389..f03777a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -640,11 +640,6 @@ struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_loc return loop; } -bool hlsl_type_is_void(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; -} - struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const struct hlsl_semantic *semantic, struct vkd3d_shader_location loc) { @@ -656,7 +651,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl decl->parameters = parameters; decl->loc = loc; - if (!hlsl_type_is_void(return_type)) + if (!hlsl_types_are_equal(return_type, ctx->builtin_types.Void)) { struct hlsl_ir_var *return_var; char name[28]; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9686a49..77b4ce9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -683,7 +683,6 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority, unsigned int modifiers); unsigned int hlsl_type_component_count(struct hlsl_type *type); unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset); -bool hlsl_type_is_void(const struct hlsl_type *type); bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); unsigned int hlsl_combine_swizzles(unsigned int first, unsigned int second, unsigned int dim); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d1ef9eb..6f1794e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -506,7 +506,7 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs return NULL; list_add_after(&return_value->entry, &store->node.entry); } - else if (!hlsl_type_is_void(return_type)) + else if (ctx->cur_function->return_var) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void function must return a value."); return NULL; @@ -2210,7 +2210,7 @@ func_prototype: "\"%s\" was previously declared here.", $3); YYABORT; } - if (hlsl_type_is_void($2) && $7.semantic.name) + if (hlsl_types_are_equal($2, ctx->builtin_types.Void) && $7.semantic.name) { hlsl_error(ctx, @7, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Semantics are not allowed on void functions.");

1 0

Zebediah Figura : tests: Use % as the shader_test comment character.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: vkd3d Branch: master Commit: 5f8becada45a014c58b2a6855d871a604524b7db URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f8becada45a014c58b2a68… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 3 19:19:07 2021 -0500 tests: Use % as the shader_test comment character. So as to avoid clashing with the preprocessor. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-array-dimension.shader_test | 3 ++- tests/hlsl-vector-indexing-uniform.shader_test | 2 +- tests/shader_runner_d3d12.c | 8 +++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/hlsl-array-dimension.shader_test b/tests/hlsl-array-dimension.shader_test index fdb52b1..469d36b 100644 --- a/tests/hlsl-array-dimension.shader_test +++ b/tests/hlsl-array-dimension.shader_test @@ -1,4 +1,5 @@ -# Test what kinds of expressions are valid array dimensions. +% Test what kinds of expressions are valid array dimensions. + [pixel shader] float4 main() : sv_target { diff --git a/tests/hlsl-vector-indexing-uniform.shader_test b/tests/hlsl-vector-indexing-uniform.shader_test index 2556b58..26a4587 100644 --- a/tests/hlsl-vector-indexing-uniform.shader_test +++ b/tests/hlsl-vector-indexing-uniform.shader_test @@ -1,4 +1,4 @@ -# Use a uniform to prevent the compiler from optimizing. +% Use a uniform to prevent the compiler from optimizing. [pixel shader] uniform int i; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index d5c0380..a0cdc5b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -452,13 +452,12 @@ START_TEST(shader_runner_d3d12) vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } - else if (line[0] != '\n') + else if (line[0] != '%' && line[0] != '\n') { switch (state) { case STATE_NONE: - if (line[0] != '#') - fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]); + fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]); break; case STATE_PREPROC: @@ -475,8 +474,7 @@ START_TEST(shader_runner_d3d12) } case STATE_TEST: - if (line[0] != '#') - parse_test_directive(&context, line); + parse_test_directive(&context, line); break; } }

1 0

Zebediah Figura : tests: Add a test for texture load instructions.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: vkd3d Branch: master Commit: b1889215ee75cd346b4a796fe79934938ff85c1b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b1889215ee75cd346b4a796… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 3 19:19:08 2021 -0500 tests: Add a test for texture load instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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/d3d12.c | 89 --------------------- tests/d3d12_test_utils.h | 89 +++++++++++++++++++++ tests/shader_runner_d3d12.c | 175 ++++++++++++++++++++++++++++++++++++++++- tests/texture-load.shader_test | 19 +++++ 5 files changed, 281 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b1889215ee75cd346b4…

1 0

Zebediah Figura : tests: Add a test for explicitly typed textures.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: vkd3d Branch: master Commit: 1e62adbee7238686c56270d5f026ba2bad1f67ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e62adbee7238686c56270d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 3 19:19:09 2021 -0500 tests: Add a test for explicitly typed textures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/shader_runner_d3d12.c | 95 ++++++++++++++++++++++++++++++++---- tests/texture-load-typed.shader_test | 49 +++++++++++++++++++ 3 files changed, 137 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 921bb79..ee3d749 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,6 +100,7 @@ vkd3d_shader_tests = \ tests/swizzle-6.shader_test \ tests/swizzle-7.shader_test \ tests/texture-load.shader_test \ + tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ @@ -301,6 +302,7 @@ XFAIL_TESTS = \ tests/math.shader_test \ tests/max.shader_test \ tests/texture-load.shader_test \ + tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 171a855..e470837 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -73,10 +73,20 @@ static bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t elemen return true; } +enum texture_data_type +{ + TEXTURE_DATA_FLOAT, + TEXTURE_DATA_SINT, + TEXTURE_DATA_UINT, +}; + struct texture { unsigned int slot; + DXGI_FORMAT format; + enum texture_data_type data_type; + unsigned int texel_size; unsigned int width, height; uint8_t *data; size_t data_size, data_capacity; @@ -150,12 +160,51 @@ static bool match_string(const char *line, const char *token, const char **const return true; } +static void parse_texture_format(struct texture *texture, const char *line) +{ + static const struct + { + const char *string; + enum texture_data_type data_type; + unsigned int texel_size; + DXGI_FORMAT format; + } + formats[] = + { + {"r32g32b32a32 float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT}, + {"r32g32 uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT}, + {"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT}, + {"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + if (match_string(line, formats[i].string, &line)) + { + texture->format = formats[i].format; + texture->data_type = formats[i].data_type; + texture->texel_size = formats[i].texel_size; + return; + } + } + + fprintf(stderr, "Unknown format '%s'.\n", line); + texture->format = DXGI_FORMAT_R32G32B32A32_FLOAT; + texture->data_type = TEXTURE_DATA_FLOAT; + texture->texel_size = 16; +} + static void parse_texture_directive(struct texture *texture, const char *line) { const char *const orig_line = line; int ret; - if (match_string(line, "size", &line)) + if (match_string(line, "format", &line)) + { + parse_texture_format(texture, line); + } + else if (match_string(line, "size", &line)) { ret = sscanf(line, "( %u , %u )", &texture->width, &texture->height); if (ret < 2) @@ -163,14 +212,39 @@ static void parse_texture_directive(struct texture *texture, const char *line) } else { + union + { + float f; + int32_t i; + uint32_t u; + } u; char *rest; - float f; - while ((f = strtof(line, &rest)) || rest != line) + u.u = 0; + + for (;;) { - vkd3d_array_reserve((void **)&texture->data, &texture->data_capacity, texture->data_size + sizeof(f), 1); - memcpy(texture->data + texture->data_size, &f, sizeof(f)); - texture->data_size += sizeof(f); + switch (texture->data_type) + { + case TEXTURE_DATA_FLOAT: + u.f = strtof(line, &rest); + break; + + case TEXTURE_DATA_SINT: + u.i = strtol(line, &rest, 10); + break; + + case TEXTURE_DATA_UINT: + u.u = strtoul(line, &rest, 10); + break; + } + + if (rest == line) + break; + + vkd3d_array_reserve((void **)&texture->data, &texture->data_capacity, texture->data_size + sizeof(u), 1); + memcpy(texture->data + texture->data_size, &u, sizeof(u)); + texture->data_size += sizeof(u); line = rest; } } @@ -191,7 +265,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin = {ID3D10Blob_GetBufferPointer(context->ps_code), ID3D10Blob_GetBufferSize(context->ps_code)}; ID3D12GraphicsCommandList *command_list = context->c.list; D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; - D3D12_ROOT_PARAMETER root_params[2], *root_param; + D3D12_ROOT_PARAMETER root_params[3], *root_param; static const float clear_color[4]; unsigned int uniform_index; ID3D12PipelineState *pso; @@ -233,9 +307,9 @@ static void parse_test_directive(struct shader_context *context, const char *lin texture->heap = create_gpu_descriptor_heap(context->c.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); texture->resource = create_default_texture(context->c.device, texture->width, texture->height, - DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); resource_data.pData = texture->data; - resource_data.SlicePitch = resource_data.RowPitch = texture->width * sizeof(struct vec4); + resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size; upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list); reset_command_list(command_list, context->c.allocator); transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, @@ -597,6 +671,9 @@ START_TEST(shader_runner_d3d12) memset(current_texture, 0, sizeof(*current_texture)); } current_texture->slot = index; + current_texture->format = DXGI_FORMAT_R32G32B32A32_FLOAT; + current_texture->data_type = TEXTURE_DATA_FLOAT; + current_texture->texel_size = 16; } else if (!strcmp(line, "[test]\n")) { diff --git a/tests/texture-load-typed.shader_test b/tests/texture-load-typed.shader_test new file mode 100644 index 0000000..c0c3568 --- /dev/null +++ b/tests/texture-load-typed.shader_test @@ -0,0 +1,49 @@ +[pixel shader fail] +texture<float> t; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +typedef Texture2D mytex_t; +mytex_t<float> t; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[texture 0] +format r32 float +size (1, 1) + +0.8 + +[texture 1] +format r32 sint +size (1, 1) + +-3 + +[texture 2] +format r32g32 uint +size (1, 1) + +4294967295 123 + +[pixel shader] +typedef int myint_t; +texture2D<float> f1; +Texture2D<myint_t> i1; +Texture2D<uint2> u2; +float4 main() : sv_target +{ + const float3 pos = float3(0.5, 0.5, 0); + return float4(f1.Load(pos), i1.Load(pos), u2.Load(pos)); +} + +[test] +draw quad +probe all rgba (0.8, -3.0, 4294967295.0, 123.0)

1 0

Hans Leidekker : wpcap: Wrap native handles in a structure.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: be9362190ccafd05a188ffeb59c08d40960979f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be9362190ccafd05a188ffeb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 4 14:36:39 2021 +0200 wpcap: Wrap native handles in a structure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/unixlib.c | 150 ++++++++++++++++++++------------------ dlls/wpcap/unixlib.h | 73 ++++++++++--------- dlls/wpcap/wpcap.c | 200 +++++++++++++++++++++++++-------------------------- 3 files changed, 222 insertions(+), 201 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be9362190ccafd05a188…

1 0

Hans Leidekker : wpcap: Convert pcap_pkthdr structures.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: a999d57d6a1757078d678a9ab0ae9734a7f8ecc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a999d57d6a1757078d678a9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 4 14:36:40 2021 +0200 wpcap: Convert pcap_pkthdr structures. Structure layout is different on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51818 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/unixlib.c | 60 ++++++++++++++++++++++++++++++++++++++++++---------- dlls/wpcap/unixlib.h | 26 +++++++++++++++++------ dlls/wpcap/wpcap.c | 13 ++++++------ 3 files changed, 75 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a999d57d6a1757078d67…

1 0

Jacek Caban : gdi32: Use pthread mutex in driver.c.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 2e14044691ac73f94d54d35024e8e6740d1bc3c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e14044691ac73f94d54d350… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 4 15:03:13 2021 +0100 gdi32: Use pthread mutex in driver.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index a1b153edf07..6a5df55bfeb 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -3,7 +3,7 @@ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) +EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 24b8a6b27b5..849be65c480 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -27,6 +27,8 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -59,14 +61,7 @@ const struct gdi_dc_funcs *driver_funcs; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); -static CRITICAL_SECTION driver_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &driver_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": driver_section") } -}; -static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t driver_lock = PTHREAD_MUTEX_INITIALIZER; /********************************************************************** * get_display_driver @@ -802,7 +797,7 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) if (!desc || !desc->hAdapter) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) { if (adapter->handle == desc->hAdapter) @@ -813,7 +808,7 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return status; } @@ -848,10 +843,10 @@ NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc if (!(adapter = malloc( sizeof( *adapter ) ))) return STATUS_NO_MEMORY; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); desc->hAdapter = adapter->handle = ++handle_start; list_add_tail( &d3dkmt_adapters, &adapter->entry ); - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return STATUS_SUCCESS; } @@ -870,7 +865,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) if (!desc) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) { if (adapter->handle == desc->hAdapter) @@ -879,7 +874,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); if (!found) return STATUS_INVALID_PARAMETER; @@ -891,10 +886,10 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) if (!device) return STATUS_NO_MEMORY; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); device->handle = ++handle_start; list_add_tail( &d3dkmt_devices, &device->entry ); - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); desc->hDevice = device->handle; return STATUS_SUCCESS; @@ -914,7 +909,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) if (!desc || !desc->hDevice) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) { if (device->handle == desc->hDevice) @@ -928,7 +923,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return status; }

1 0