wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Remove enum hlsl_error_level (clangd).

Browse Source 
It is only used once for calling hlsl_note(), and it expects an enum
vkd3d_shader_log_level values instead.
This commit is contained in:
Francisco Casas 2023-10-11 10:34:22 -03:00 committed by Alexandre Julliard
parent 432fa8fa8f
commit 7960836551
Notes: Alexandre Julliard 2023-10-12 23:35:30 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/402
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d-shader/hlsl.h
View File

@ -864,13 +864,6 @@ struct hlsl_ctx
uint32_t found_numthreads : 1; uint32_t found_numthreads : 1;
}; };
enum hlsl_error_level
{
HLSL_LEVEL_ERROR = 0,
HLSL_LEVEL_WARNING,
HLSL_LEVEL_NOTE,
};
struct hlsl_resource_load_params struct hlsl_resource_load_params
{ {
struct hlsl_type *format; struct hlsl_type *format;

4
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -249,7 +249,7 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir
{ {
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
"Output semantic \"%s%u\" is used multiple times.", semantic->name, index); "Output semantic \"%s%u\" is used multiple times.", semantic->name, index);
hlsl_note(ctx, &ext_var->loc, HLSL_LEVEL_ERROR, hlsl_note(ctx, &ext_var->loc, VKD3D_SHADER_LOG_ERROR,
"First use of \"%s%u\" is here.", semantic->name, index); "First use of \"%s%u\" is here.", semantic->name, index);
semantic->reported_duplicated_output_next_index = index + 1; semantic->reported_duplicated_output_next_index = index + 1;
} }
@ -262,7 +262,7 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
"Input semantic \"%s%u\" is used multiple times with incompatible types.", "Input semantic \"%s%u\" is used multiple times with incompatible types.",
semantic->name, index); semantic->name, index);
hlsl_note(ctx, &ext_var->loc, HLSL_LEVEL_ERROR, hlsl_note(ctx, &ext_var->loc, VKD3D_SHADER_LOG_ERROR,
"First declaration of \"%s%u\" is here.", semantic->name, index); "First declaration of \"%s%u\" is here.", semantic->name, index);
semantic->reported_duplicated_input_incompatible_next_index = index + 1; semantic->reported_duplicated_input_incompatible_next_index = index + 1;
} }