wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Zebediah Figura : vkd3d-shader/hlsl: Avoid hardcoding the size of the operands array.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: 98cfd7b09fff8b433fb68225a1dc8bf60c304fcc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98cfd7b09fff8b433fb6822… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:44 2021 -0500 vkd3d-shader/hlsl: Avoid hardcoding the size of the operands array. 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> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 4 +++- libs/vkd3d-shader/hlsl.y | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 30098ea..932593f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1108,7 +1108,7 @@ static void dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_i unsigned int i; vkd3d_string_buffer_printf(buffer, "%s (", debug_hlsl_expr_op(expr->op)); - for (i = 0; i < 3 && expr->operands[i].node; ++i) + for (i = 0; i < HLSL_MAX_OPERANDS && expr->operands[i].node; ++i) { dump_src(buffer, &expr->operands[i]); vkd3d_string_buffer_printf(buffer, " "); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index abc870f..7e62839 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -323,11 +323,13 @@ enum hlsl_ir_expr_op HLSL_OP3_LERP, }; +#define HLSL_MAX_OPERANDS 3 + struct hlsl_ir_expr { struct hlsl_ir_node node; enum hlsl_ir_expr_op op; - struct hlsl_src operands[3]; + struct hlsl_src operands[HLSL_MAX_OPERANDS]; }; enum hlsl_ir_jump_type diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5aa2d8f..2a38470 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1022,15 +1022,15 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return hlsl_new_type(ctx, NULL, type, base, dimx, dimy); } -static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, - enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], struct vkd3d_shader_location *loc) +static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct vkd3d_shader_location *loc) { struct hlsl_ir_expr *expr; struct hlsl_type *type; unsigned int i; type = operands[0]->data_type; - for (i = 1; i <= 2; ++i) + for (i = 1; i < HLSL_MAX_OPERANDS; ++i) { if (!operands[i]) break; @@ -1038,7 +1038,7 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, if (!type) return NULL; } - for (i = 0; i <= 2; ++i) + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) { struct hlsl_ir_expr *cast; @@ -1062,7 +1062,7 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return NULL; init_node(&expr->node, HLSL_IR_EXPR, type, *loc); expr->op = op; - for (i = 0; i <= 2; ++i) + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) hlsl_src_from_node(&expr->operands[i], operands[i]); list_add_tail(instrs, &expr->node.entry); @@ -1083,7 +1083,7 @@ static struct list *add_unary_expr(struct hlsl_ctx *ctx, struct list *instrs, static struct list *add_binary_expr(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {node_from_list(list1), node_from_list(list2)}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {node_from_list(list1), node_from_list(list2)}; list_move_tail(list1, list2); vkd3d_free(list2); @@ -1157,7 +1157,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in if (assign_op == ASSIGN_OP_SUB) { - struct hlsl_ir_node *args[3] = {rhs}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {rhs}; struct hlsl_ir_expr *expr; if (!(expr = add_expr(ctx, instrs, HLSL_OP1_NEG, args, &rhs->loc))) @@ -1167,8 +1167,8 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } if (assign_op != ASSIGN_OP_ASSIGN) { + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {lhs, rhs}; enum hlsl_ir_expr_op op = op_from_assignment(assign_op); - struct hlsl_ir_node *args[3] = {lhs, rhs}; struct hlsl_ir_expr *expr; assert(op); @@ -1556,7 +1556,7 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0]}; return !!add_expr(ctx, params->instrs, HLSL_OP1_ABS, args, &loc); } @@ -1564,7 +1564,7 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx, static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0], params->args[1]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0], params->args[1]}; struct hlsl_ir_expr *max; if (!(max = add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc))) @@ -1578,7 +1578,7 @@ static bool intrinsic_clamp(struct hlsl_ctx *ctx, static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0], params->args[1]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0], params->args[1]}; return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); } @@ -1586,7 +1586,7 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {0}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; struct hlsl_ir_node *log, *exp; struct hlsl_ir_expr *mul; @@ -1608,7 +1608,7 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0]}; return !!add_expr(ctx, params->instrs, HLSL_OP1_SAT, args, &loc); }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Specify the destination register in struct sm4_instruction as an array.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: 897ba6a3c7b9e9d8b4a21707490e467b7bf0305a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=897ba6a3c7b9e9d8b4a2170… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Sep 27 20:51:43 2021 -0500 vkd3d-shader/hlsl: Specify the destination register in struct sm4_instruction as an array. Some instructions (e.g. umul) have multiple destination registers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 85 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 49579dd..f724943 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -572,7 +572,8 @@ struct sm4_instruction { struct sm4_register reg; unsigned int writemask; - } dst; + } dsts[1]; + unsigned int dst_count; struct { @@ -583,8 +584,6 @@ struct sm4_instruction uint32_t idx[2]; unsigned int idx_count; - - unsigned int has_dst; }; static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) @@ -724,8 +723,8 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st uint32_t token = instr->opcode; unsigned int size = 1, i, j; - if (instr->has_dst) - size += sm4_register_order(&instr->dst.reg); + for (i = 0; i < instr->dst_count; ++i) + size += sm4_register_order(&instr->dsts[i].reg); for (i = 0; i < instr->src_count; ++i) size += sm4_register_order(&instr->srcs[i].reg); size += instr->idx_count; @@ -733,15 +732,15 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); put_u32(buffer, token); - if (instr->has_dst) + for (i = 0; i < instr->dst_count; ++i) { - token = sm4_encode_register(&instr->dst.reg); - if (instr->dst.reg.dim == VKD3D_SM4_DIMENSION_VEC4) - token |= instr->dst.writemask << VKD3D_SM4_WRITEMASK_SHIFT; + token = sm4_encode_register(&instr->dsts[i].reg); + if (instr->dsts[i].reg.dim == VKD3D_SM4_DIMENSION_VEC4) + token |= instr->dsts[i].writemask << VKD3D_SM4_WRITEMASK_SHIFT; put_u32(buffer, token); - for (j = 0; j < instr->dst.reg.idx_count; ++j) - put_u32(buffer, instr->dst.reg.idx[j]); + for (j = 0; j < instr->dsts[i].reg.idx_count; ++j) + put_u32(buffer, instr->dsts[i].reg.idx[j]); } for (i = 0; i < instr->src_count; ++i) @@ -801,33 +800,33 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b struct sm4_instruction instr = { - .dst.reg.dim = VKD3D_SM4_DIMENSION_VEC4, - .has_dst = 1, + .dsts[0].reg.dim = VKD3D_SM4_DIMENSION_VEC4, + .dst_count = 1, }; - if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &instr.dst.reg.type, &has_idx)) + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &instr.dsts[0].reg.type, &has_idx)) { if (has_idx) { - instr.dst.reg.idx[0] = var->semantic.index; - instr.dst.reg.idx_count = 1; + instr.dsts[0].reg.idx[0] = var->semantic.index; + instr.dsts[0].reg.idx_count = 1; } else { - instr.dst.reg.idx_count = 0; + instr.dsts[0].reg.idx_count = 0; } - instr.dst.writemask = (1 << var->data_type->dimx) - 1; + instr.dsts[0].writemask = (1 << var->data_type->dimx) - 1; } else { - instr.dst.reg.type = output ? VKD3D_SM4_RT_OUTPUT : VKD3D_SM4_RT_INPUT; - instr.dst.reg.idx[0] = var->reg.id; - instr.dst.reg.idx_count = 1; - instr.dst.writemask = var->reg.writemask; + instr.dsts[0].reg.type = output ? VKD3D_SM4_RT_OUTPUT : VKD3D_SM4_RT_INPUT; + instr.dsts[0].reg.idx[0] = var->reg.id; + instr.dsts[0].reg.idx_count = 1; + instr.dsts[0].writemask = var->reg.writemask; } - if (instr.dst.reg.type == VKD3D_SM4_RT_DEPTHOUT) - instr.dst.reg.dim = VKD3D_SM4_DIMENSION_SCALAR; + if (instr.dsts[0].reg.type == VKD3D_SM4_RT_DEPTHOUT) + instr.dsts[0].reg.dim = VKD3D_SM4_DIMENSION_SCALAR; hlsl_sm4_usage_from_semantic(ctx, &var->semantic, output, &usage); @@ -915,11 +914,11 @@ static void write_sm4_unary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_ memset(&instr, 0, sizeof(instr)); instr.opcode = opcode; - sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst); - instr.has_dst = 1; + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst); + instr.dst_count = 1; sm4_register_from_node(&instr.srcs[0].reg, &writemask, src); - instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.srcs[0].reg.mod = src_mod; instr.src_count = 1; @@ -935,13 +934,13 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d memset(&instr, 0, sizeof(instr)); instr.opcode = opcode; - sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst); - instr.has_dst = 1; + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst); + instr.dst_count = 1; sm4_register_from_node(&instr.srcs[0].reg, &writemask, src1); - instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); sm4_register_from_node(&instr.srcs[1].reg, &writemask, src2); - instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.src_count = 2; write_sm4_instruction(buffer, &instr); @@ -957,8 +956,8 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &constant->node); - instr.has_dst = 1; + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &constant->node); + instr.dst_count = 1; instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; @@ -1182,11 +1181,11 @@ static void write_sm4_load(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &load->node); - instr.has_dst = 1; + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &load->node); + instr.dst_count = 1; sm4_register_from_deref(ctx, &instr.srcs[0].reg, &writemask, &load->src, load->node.data_type); - instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.src_count = 1; write_sm4_instruction(buffer, &instr); @@ -1208,12 +1207,12 @@ static void write_sm4_store(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_deref(ctx, &instr.dst.reg, &writemask, &store->lhs, rhs->data_type); - instr.dst.writemask = hlsl_combine_writemasks(writemask, store->writemask); - instr.has_dst = 1; + sm4_register_from_deref(ctx, &instr.dsts[0].reg, &writemask, &store->lhs, rhs->data_type); + instr.dsts[0].writemask = hlsl_combine_writemasks(writemask, store->writemask); + instr.dst_count = 1; sm4_register_from_node(&instr.srcs[0].reg, &writemask, rhs); - instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.src_count = 1; write_sm4_instruction(buffer, &instr); @@ -1228,12 +1227,12 @@ static void write_sm4_swizzle(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &swizzle->node); - instr.has_dst = 1; + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &swizzle->node); + instr.dst_count = 1; sm4_register_from_node(&instr.srcs[0].reg, &writemask, swizzle->val.node); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_combine_swizzles(hlsl_swizzle_from_writemask(writemask), - swizzle->swizzle, swizzle->node.data_type->dimx), instr.dst.writemask); + swizzle->swizzle, swizzle->node.data_type->dimx), instr.dsts[0].writemask); instr.src_count = 1; write_sm4_instruction(buffer, &instr);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse state blocks in variable definitions.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: efab7c82a5b59f84916ec2cb16ff073a3b4dcbcb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=efab7c82a5b59f84916ec2c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:42 2021 -0500 vkd3d-shader/hlsl: Parse state blocks in variable definitions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 54 ++++++++-- tests/hlsl-state-block-syntax.shader_test | 173 ++++++++++++++++++++++++++++++ 4 files changed, 223 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4a2bf8e..bc33e0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,6 +74,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ + tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 27afeed..abc870f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -469,6 +469,8 @@ struct hlsl_ctx size_t count, size; } constant_defs; uint32_t temp_count; + + uint32_t in_state_block : 1; }; enum hlsl_error_level diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b2d5ba2..5aa2d8f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2558,6 +2558,23 @@ variable_decl: $$->reg_reservation = $3.reg_reservation; } +state: + any_identifier '=' expr ';' + { + vkd3d_free($1); + hlsl_free_instr_list($3); + } + +state_block_start: + %empty + { + ctx->in_state_block = 1; + } + +state_block: + %empty + | state_block state + variable_def: variable_decl | variable_decl '=' complex_initializer @@ -2565,6 +2582,11 @@ variable_def: $$ = $1; $$->initializer = $3; } + | variable_decl '{' state_block_start state_block '}' + { + $$ = $1; + ctx->in_state_block = 0; + } arrays: %empty @@ -2861,13 +2883,10 @@ primary_expr: hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Variable \"%s\" is not defined.", $1); YYABORT; } - if ((load = hlsl_new_var_load(ctx, var, @1))) - { - if (!($$ = make_list(ctx, &load->node))) - YYABORT; - } - else - $$ = NULL; + if (!(load = hlsl_new_var_load(ctx, var, @1))) + YYABORT; + if (!($$ = make_list(ctx, &load->node))) + YYABORT; } | '(' expr ')' { @@ -2878,6 +2897,27 @@ primary_expr: if (!($$ = add_call(ctx, $1, &$3, @1))) YYABORT; } + | NEW_IDENTIFIER + { + if (ctx->in_state_block) + { + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (!(var = hlsl_new_synthetic_var(ctx, "<state-block-expr>", + ctx->builtin_types.scalar[HLSL_TYPE_INT], @1))) + YYABORT; + if (!(load = hlsl_new_var_load(ctx, var, @1))) + YYABORT; + if (!($$ = make_list(ctx, &load->node))) + YYABORT; + } + else + { + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Identifier \"%s\" is not declared.\n", $1); + YYABORT; + } + } postfix_expr: primary_expr diff --git a/tests/hlsl-state-block-syntax.shader_test b/tests/hlsl-state-block-syntax.shader_test new file mode 100644 index 0000000..26853bf --- /dev/null +++ b/tests/hlsl-state-block-syntax.shader_test @@ -0,0 +1,173 @@ +[pixel shader fail] +sampler s +{ + foo = float; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s = sampler_state +{ + foo = float; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + 2 = 3; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + 2; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + foo; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + foo = bar +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s {} + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f {} = 1; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f = 1 {}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s = sampler_state; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f {} : register(c1); + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = (sampler)2; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = (faketype)2; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = (sampler)bar; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = bar(); +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader] +float u : register(c1) {}; +float4 main() : sv_target +{ + float zero = 0; + float a {}; + float b + { + foo = bar; + foo = bar; + foo = (int)2; + foo = (int)bar; + foo = float4(bar, baz, qux, xyzzy); + foo = zero++; + }; + float c {}, d = 1, e; + struct {int a;} s {foo = bar;}; + return float4(0, 1, zero, 1); +} + +[test] +draw quad +probe all rgba (0, 1, 0, 1)

1 0

Jeremy Newman : ignore site redirect
by Jeremy Newman 01 Oct '21

01 Oct '21

Module: website Branch: master Commit: 5abcc2ab5e12ab7da9ca8ad519ac00ee5979be1a URL: https://source.winehq.org/git/website.git/?a=commit;h=5abcc2ab5e12ab7da9ca8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 1 15:22:51 2021 -0500 ignore site redirect --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f72166c8..3e820fc4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +site /data /docs /hypermail

1 0

Jeremy Newman : wine patches list is closed, remove links to it
by Jeremy Newman 01 Oct '21

01 Oct '21

Module: website Branch: master Commit: f1043a52fc6d62e8c56bb2eafb01165cff338224 URL: https://source.winehq.org/git/website.git/?a=commit;h=f1043a52fc6d62e8c56bb… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 1 14:59:51 2021 -0500 wine patches list is closed, remove links to it we will leave the archive up in the en version --- templates/en/forums.template | 5 ++--- templates/fr/forums.template | 9 --------- templates/ko/forums.template | 9 --------- templates/pl/forums.template | 8 -------- templates/pt/forums.template | 8 -------- templates/tr/forums.template | 9 --------- templates/zh-cn/forums.template | 8 -------- 7 files changed, 2 insertions(+), 54 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 9f467ecf..61b4531e 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -63,11 +63,10 @@ mailing list software. </li> <li> - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] + <a href="mailto:wine-devel@winehq.org">wine-patches(a)winehq.org</a> [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - A deprecated list for submitting patches. Use <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> instead. + A deprecated list for submitting patches. Use <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> instead. </li> <li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index 6a70658c..a1ffa884 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -53,15 +53,6 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// Une liste moyen trafic (50 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. </li> - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via un lecteur de nouvelles</a>] - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - Une liste moyen trafic (45 messages par jour) destinée uniquement à l'envoi de patchs. - </li> - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] diff --git a/templates/ko/forums.template b/templates/ko/forums.template index 8c5619bc..e932580b 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -72,15 +72,6 @@ href="//www.winehq.org/mailman/listinfo">Mailman 웹 인터페이스</a>에서 메시지 전송 빈도: 1일에 50여통(중간) </li> - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">구독/해지</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">메시지 기록 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">메시지 기록 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">뉴스 리더로 보기</a>] - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - 과거에 패치를 제출하는 데 사용했던 메일링 리스트입니다. <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> 리스트를 사용하십시오. - </li> - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">구독/해지</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">메시지 기록 1</a>] diff --git a/templates/pl/forums.template b/templates/pl/forums.template index e8b72926..142b90c7 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -59,14 +59,6 @@ oprogramowanie listy mailingowej. Średni ruch (50/dziennie) otwarta lista dla dyskusji nt. tworzenia Wine, WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archiwum 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archiwum 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">przez czytnik aktualności</a>] - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - Średni ruch (45/dziennie) otwarta lista przeznaczona wyłącznie do wysyłania łatek. - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Wy-/Za-)pisz</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archiwum 1</a>] diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 72d86244..bd618868 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -61,14 +61,6 @@ do contrário o seu email será tratado como um possível spam pelo software da Uma lista aberta de tráfego médio (50/dia) para discutir desenvolvimento do Wine, WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arquivo 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arquivo 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - Uma lista aberta de tráfego médio (45/dia) para submeter patches apenas. - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Des-)Inscrever</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arquivo 1</a>] diff --git a/templates/tr/forums.template b/templates/tr/forums.template index 07e80b17..ee8bf648 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -53,15 +53,6 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri Wine geliştirmesi, WineHQ, yamalar ve Wine geliştiricileri ile alakalı diğer şeylerle ilgili orta trafikli (50/gün) bir açık liste </li> - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arşiv 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arşiv 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">haber okuyucu ile</a>] - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - Sadece yamaları göndermek için kullanılan orta trafikli (45/gün) bir liste - </li> - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">Abone ol/iptal et</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arşiv 1</a>] diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 8e283c21..66c56778 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -51,14 +51,6 @@ WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <cod 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li> - <li> - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] - 一个已经废弃的用于提交补丁的列表。请使用 <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> 代替。 - </li> - <li> <a href="mailto:wine-cvs@winehq.org">wine-cvs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021