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: Add initial support for parsing annotations.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2023-11-14 01:28:28 +01:00 committed by Alexandre Julliard
parent 341963bbec
commit fe8881747b
Notes: Alexandre Julliard 2024-01-23 23:03:22 +01:00 
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/565
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,6 +408,8 @@ struct hlsl_ir_var
struct list extern_entry; struct list extern_entry;
/* Scope that variable itself defines, used to provide a container for techniques and passes. */ /* Scope that variable itself defines, used to provide a container for techniques and passes. */
struct hlsl_scope *scope; struct hlsl_scope *scope;
/* Scope that contains annotations for this variable. */
struct hlsl_scope *annotations;
/* Indexes of the IR instructions where the variable is first written and last read (liveness /* Indexes of the IR instructions where the variable is first written and last read (liveness
* range). The IR instructions are numerated starting from 2, because 0 means unused, and 1 * range). The IR instructions are numerated starting from 2, because 0 means unused, and 1

32
libs/vkd3d-shader/hlsl.y
View File

@ -1122,7 +1122,7 @@ static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_sc
} }
static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope,
const struct vkd3d_shader_location *loc) struct hlsl_scope *annotations, const struct vkd3d_shader_location *loc)
{ {
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
struct hlsl_type *type; struct hlsl_type *type;
@ -1131,6 +1131,7 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl
if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL)))
return false; return false;
var->scope = scope; var->scope = scope;
var->annotations = annotations;
if (!hlsl_add_var(ctx, var, false)) if (!hlsl_add_var(ctx, var, false))
{ {
@ -4999,6 +5000,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls
struct hlsl_attribute *attr; struct hlsl_attribute *attr;
struct parse_attribute_list attr_list; struct parse_attribute_list attr_list;
struct hlsl_ir_switch_case *switch_case; struct hlsl_ir_switch_case *switch_case;
struct hlsl_scope *scope;
} }
%token KW_BLENDSTATE %token KW_BLENDSTATE
@ -5124,6 +5126,8 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls
%token <name> STRING %token <name> STRING
%token <name> TYPE_IDENTIFIER %token <name> TYPE_IDENTIFIER
%type <scope> annotations_opt
%type <arrays> arrays %type <arrays> arrays
%type <assign_op> assign_op %type <assign_op> assign_op
@ -5242,6 +5246,28 @@ name_opt:
pass: pass:
KW_PASS name_opt '{' '}' KW_PASS name_opt '{' '}'
annotations_list:
variables_def_typed ';'
| annotations_list variables_def_typed ';'
annotations_opt:
%empty
{
$$ = NULL;
}
| '<' scope_start '>'
{
hlsl_pop_scope(ctx);
$$ = NULL;
}
| '<' scope_start annotations_list '>'
{
struct hlsl_scope *scope = ctx->cur_scope;
hlsl_pop_scope(ctx);
$$ = scope;
}
pass_list: pass_list:
pass pass
| pass_list pass | pass_list pass
@ -5302,11 +5328,11 @@ group_techniques:
| group_techniques group_technique | group_techniques group_technique
effect_group: effect_group:
KW_FXGROUP any_identifier '{' scope_start group_techniques '}' KW_FXGROUP any_identifier annotations_opt '{' scope_start group_techniques '}'
{ {
struct hlsl_scope *scope = ctx->cur_scope; struct hlsl_scope *scope = ctx->cur_scope;
hlsl_pop_scope(ctx); hlsl_pop_scope(ctx);
if (!(add_effect_group(ctx, $2, scope, &@2))) if (!(add_effect_group(ctx, $2, scope, $3, &@2)))
YYABORT; YYABORT;
} }