- Wine-Devel - list.winehq.org

[PATCH vkd3d v4 8/8] vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Francisco Casas March 9, 2022

March 9, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 91 +++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fecb45ae..efed7e13 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1599,61 +1599,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v); -- 2.25.1

1 0

[PATCH vkd3d v4 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Francisco Casas March 9, 2022

March 9, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4ced58c9..fecb45ae 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1623,23 +1623,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; } -- 2.25.1

1 0

[PATCH vkd3d v4 6/8] vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Francisco Casas March 9, 2022

March 9, 2022

The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3989c7dd..4ced58c9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1602,19 +1602,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { -- 2.25.1

1 0

[PATCH vkd3d v4 5/8] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas March 9, 2022

March 9, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e7c4c307..3989c7dd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); + free_parse_variable_def(v); return list; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,7 +729,10 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) + { + free_parse_variable_def(v); return false; + } } else { @@ -729,8 +742,12 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) + { + free_parse_variable_def(v); return false; + } } + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +764,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1470,15 +1488,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1510,6 +1519,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1569,6 +1579,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1581,6 +1592,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

1 0

[PATCH vkd3d v4 4/8] vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Francisco Casas March 9, 2022

March 9, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 365d433f..e7c4c307 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -48,6 +48,7 @@ struct parse_initializer struct hlsl_ir_node **args; unsigned int args_count; struct list *instrs; + bool braces; }; struct parse_array_sizes @@ -3218,14 +3219,17 @@ complex_initializer: } $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | '{' complex_initializer_list '}' { $$ = $2; + $$.braces = true; } | '{' complex_initializer_list ',' '}' { $$ = $2; + $$.braces = true; } complex_initializer_list: @@ -3256,6 +3260,7 @@ initializer_expr_list: YYABORT; $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | initializer_expr_list ',' initializer_expr { @@ -3389,6 +3394,7 @@ func_arguments: $$.args_count = 0; if (!($$.instrs = make_empty_list(ctx))) YYABORT; + $$.braces = false; } | initializer_expr_list -- 2.25.1

1 0

[PATCH vkd3d v4 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas March 9, 2022

March 9, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - Avoiding leak in case hlsl_realloc fails, also in "initializer_expr_list:". Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8c66a33c..365d433f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2411,6 +2411,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3218,15 +3219,32 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + $$ = $1; + if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + for (unsigned int i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

1 0

[PATCH vkd3d v4 1/8] vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Francisco Casas March 9, 2022

March 9, 2022

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..1fd5dc58 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -793,8 +793,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 62dbce5e..6da2b3a9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP; -- 2.25.1

1 0

[PATCH 1/2] dlls/wininet/tests: use correct integral type
by Eric Pouech March 9, 2022

March 9, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..706b8fa623b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -363,7 +363,7 @@ static void _test_http_version(unsigned line, HINTERNET req) ok_(__FILE__,line)(v.dwMinorVersion == 1, "dwMinorVersion = %d\n", v.dwMinorVersion); } -static int close_handle_cnt; +static LONG close_handle_cnt; static VOID WINAPI callback( HINTERNET hInternet,

2 3

[PATCH] mscms: make the correct value for bmformat.
by 赵意 March 9, 2022

March 9, 2022

Log: for driver "SHARP DX-2008UC", the wrong value for bmformat causes incorrect color picture data to be printed. Signed-off-by: zhaoyi <zhaoyi(a)uniontech.com> Change-Id: I9818dbd86f8a58777e185a76f027fd1c30b7f7ff ---  dlls/mscms/liblcms.c | 10 +++++-----  1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 1f43c359c4..522e1dc3d0 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -49,12 +49,12 @@ static DWORD from_bmformat( BMFORMAT format )        switch (format)      { -    case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; -    case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break;      case BM_GRAY:        ret = TYPE_GRAY_8; break; -    case BM_xRGBQUADS:   ret = TYPE_ARGB_8; break; -    case BM_xBGRQUADS:   ret = TYPE_ABGR_8; break; -    case BM_KYMCQUADS:   ret = TYPE_KYMC_8; break; +    case BM_xRGBQUADS:   ret = TYPE_ABGR_8; break; +    case BM_xBGRQUADS:   ret = TYPE_ARGB_8; break; +    case BM_KYMCQUADS:   ret = TYPE_CMYK_8; break;      default:          if (!quietfixme)          { --  2.20.1

3 2

[PATCH] mshtml: implement the IsNoCacheReponse method
by Pat Leamon March 9, 2022

March 9, 2022

Implements IsNoCacheReponse based on IsNoStoreReponse implementation. Signed-off-by: Pat Leamon <pleamonhp(a)yahoo.com.au> --- dlls/mshtml/nsio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fc6602eddf4..33d26670e4c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1501,10 +1501,15 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, cpp_boo static nsresult NSAPI nsChannel_IsNoCacheResponse(nsIHttpChannel *iface, cpp_bool *_retval) { nsChannel *This = impl_from_nsIHttpChannel(iface); + http_header_t *header; - FIXME("(%p)->(%p)\n", This, _retval); + static const WCHAR cache_controlW[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l'}; - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%p)\n", This, _retval); + + header = find_http_header(&This->response_headers, cache_controlW, ARRAY_SIZE(cache_controlW)); + *_retval = header && !wcsicmp(header->data, L"no-cache"); + return NS_OK; } static nsresult NSAPI nsChannel_IsPrivateResponse(nsIHttpChannel *iface, cpp_bool *_retval) -- 2.25.1

1 0