[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Drop extra '\n' from hlsl_fixme() messages.
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index f661dbc2..0cdd3917 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -790,7 +790,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 872118c1..afc4d26b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1519,11 +1519,11 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint."); break; default: @@ -1532,15 +1532,15 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_HALF: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double."); break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool."); break; default: @@ -2019,7 +2019,7 @@ static void write_sm4_store(struct hlsl_ctx *ctx, if (store->lhs.var->data_type->type == HLSL_CLASS_MATRIX) { - hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable.\n"); + hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable."); return; } @@ -2072,7 +2072,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; } -- 2.34.1
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 8 ++++---- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9918be72..1eb7d2ee 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1920,7 +1920,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if (intrinsic->param_count >= 0 && params->args_count != intrinsic->param_count) { hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of arguments to function '%s': expected %u, but got %u.\n", + "Wrong number of arguments to function '%s': expected %u, but got %u.", name, intrinsic->param_count, params->args_count); free_parse_initializer(params); return NULL; @@ -1938,7 +1938,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if ((string = hlsl_type_to_string(ctx, params->args[i]->data_type))) hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Wrong type for argument %u of '%s': expected a numeric type, but got '%s'.\n", + "Wrong type for argument %u of '%s': expected a numeric type, but got '%s'.", i + 1, name, string->buffer); hlsl_release_string_buffer(ctx, string); free_parse_initializer(params); @@ -2969,7 +2969,7 @@ type: string = hlsl_type_to_string(ctx, $3); if (string) hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Texture data type %s is not scalar or vector.\n", string->buffer); + "Texture data type %s is not scalar or vector.", string->buffer); hlsl_release_string_buffer(ctx, string); } $$ = hlsl_new_texture_type(ctx, $1, $3); @@ -3489,7 +3489,7 @@ primary_expr: } else { - hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Identifier \"%s\" is not declared.\n", $1); + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Identifier \"%s\" is not declared.", $1); YYABORT; } } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index afc4d26b..1d745f6d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1417,7 +1417,7 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer if (!encode_texel_offset_as_aoffimmi(&instr, texel_offset)) { hlsl_error(ctx, &texel_offset->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET, - "Offset must resolve to integer literal in the range -8 to 7.\n"); + "Offset must resolve to integer literal in the range -8 to 7."); return; } } -- 2.34.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1d745f6d..400c3a62 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -290,6 +290,8 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) { case HLSL_TYPE_BOOL: return D3D_SVT_BOOL; + case HLSL_TYPE_DOUBLE: + return D3D_SVT_DOUBLE; case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: return D3D_SVT_FLOAT; -- 2.34.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
participants (2)
-
Henri Verbeet -
Matteo Bruni